diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-02 13:22:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-02 13:22:28 (GMT) |
| commit | ee45fce4a48bf464fbc13d55abc0ca93a32645ee (patch) | |
| tree | a2d208dddf629f9b90c83255d31ff830b64d7f66 | |
| parent | 0ba0c67ba3af352c2e53da03136d1d032b4e41c4 (diff) | |
| parent | 0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534 (diff) | |
| download | CMake-ee45fce4a48bf464fbc13d55abc0ca93a32645ee.zip CMake-ee45fce4a48bf464fbc13d55abc0ca93a32645ee.tar.gz CMake-ee45fce4a48bf464fbc13d55abc0ca93a32645ee.tar.bz2 | |
Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags'
0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression
| -rw-r--r-- | Modules/GenerateExportHeader.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 735a0d7..e33b927 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -415,6 +415,7 @@ function(add_compiler_export_flags) if(ARGC GREATER 0) set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE) else() - string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}" PARENT_SCOPE) + string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE) endif() endfunction() |