diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-01 19:32:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-01 19:33:49 (GMT) |
| commit | 0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534 (patch) | |
| tree | 68271a0122d07f11b907e25206584f6922306969 /Modules/GenerateExportHeader.cmake | |
| parent | 0c46750d2c4cee401f1cda047a71b0e349678077 (diff) | |
| download | CMake-0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534.zip CMake-0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534.tar.gz CMake-0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534.tar.bz2 | |
GenerateExportHeader: Fix add_compiler_export_flags regression
The mechanical conversion in commit 5d0d980d (Use string(APPEND) in
Modules, 2016-07-28) accidentally introduced use of
string(APPEND ... PARENT_SCOPE)
Split that into the string(APPEND) and set(PARENT_SCOPE) pieces.
Diffstat (limited to 'Modules/GenerateExportHeader.cmake')
| -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() |