diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-18 13:03:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-18 13:03:40 (GMT) |
| commit | bc7d64f896d6e180970cb404cc7699732db34adc (patch) | |
| tree | c8ad34c4c8987e2c3b0fb0cdd59568551133c6b6 /Modules/Platform | |
| parent | 44f8f839cbdddcb756bdb561b0905933e7551867 (diff) | |
| parent | 9e24af01375d370ae84c40a95501aa5a33d3fe97 (diff) | |
| download | CMake-bc7d64f896d6e180970cb404cc7699732db34adc.zip CMake-bc7d64f896d6e180970cb404cc7699732db34adc.tar.gz CMake-bc7d64f896d6e180970cb404cc7699732db34adc.tar.bz2 | |
Merge topic 'string-append'
9e24af01 Use string(APPEND) in Modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !864
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/AIX-GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/CYGWIN-GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/HP-UX-GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Modules/Platform/AIX-GNU.cmake b/Modules/Platform/AIX-GNU.cmake index ca6e97c..7f08c4a 100644 --- a/Modules/Platform/AIX-GNU.cmake +++ b/Modules/Platform/AIX-GNU.cmake @@ -19,7 +19,7 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-brtl") macro(__aix_compiler_gnu lang) set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") - set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-bnoipath") + string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-G,-bnoipath") set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-bexpall") set(CMAKE_${lang}_USE_IMPLICIT_LINK_DIRECTORIES_IN_RUNTIME_PATH 1) diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake index d08dc81..784c8c6 100644 --- a/Modules/Platform/CYGWIN-GNU.cmake +++ b/Modules/Platform/CYGWIN-GNU.cmake @@ -40,7 +40,7 @@ macro(__cygwin_compiler_gnu lang) set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-all-symbols") # TODO: Is -Wl,--enable-auto-import now always default? - set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,--enable-auto-import") + string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,--enable-auto-import") set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}") if(NOT CMAKE_RC_COMPILER_INIT) diff --git a/Modules/Platform/HP-UX-GNU.cmake b/Modules/Platform/HP-UX-GNU.cmake index 7ac804b..699c4aa 100644 --- a/Modules/Platform/HP-UX-GNU.cmake +++ b/Modules/Platform/HP-UX-GNU.cmake @@ -9,7 +9,7 @@ endif() set(__HPUX_COMPILER_GNU 1) macro(__hpux_compiler_gnu lang) - set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-E,-b,+nodefaultrpath") + string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-E,-b,+nodefaultrpath") set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-E") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,+b") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index e4aca6e..cfe6e1c 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -152,9 +152,9 @@ if(WINCE) foreach(lang C CXX) if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "ARM") - set(_PLATFORM_DEFINES_${lang} "${_PLATFORM_DEFINES_${lang}} /D${MSVC_${lang}_ARCHITECTURE_ID}") + string(APPEND _PLATFORM_DEFINES_${lang} " /D${MSVC_${lang}_ARCHITECTURE_ID}") if(MSVC_${lang}_ARCHITECTURE_ID MATCHES "^ARMV([45])I$") - set(_FLAGS_${lang} "${_FLAGS_${lang}} /QRarch${CMAKE_MATCH_1}T") + string(APPEND _FLAGS_${lang} " /QRarch${CMAKE_MATCH_1}T") endif() endif() endforeach() |