diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-09 13:09:57 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-09-11 19:23:24 (GMT) |
| commit | 858d5a0b3e52dbae635fac5a6944fba23a362f5b (patch) | |
| tree | 76f2be038609faeb88abfb1d02826aec6250d659 | |
| parent | e177e7affb10fc25b71d4c9d9796c9df7fcdb800 (diff) | |
| download | CMake-858d5a0b3e52dbae635fac5a6944fba23a362f5b.zip CMake-858d5a0b3e52dbae635fac5a6944fba23a362f5b.tar.gz CMake-858d5a0b3e52dbae635fac5a6944fba23a362f5b.tar.bz2 | |
Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin
The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable
named "CYGWIN" to "1". Avoid allowing if() to expand the "CYGWIN"
string as a variable.
| -rw-r--r-- | CMakeCPack.cmake | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 66ec900..22ca8cf 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -50,7 +50,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") if(NOT DEFINED CPACK_SYSTEM_NAME) # make sure package is not Cygwin-unknown, for Cygwin just # cygwin is good for the system name - if("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN") + if("x${CMAKE_SYSTEM_NAME}" STREQUAL "xCYGWIN") set(CPACK_SYSTEM_NAME Cygwin) else() set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54aad83..14f60ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,7 +381,7 @@ macro (CMAKE_BUILD_UTILITIES) # Use curses? if (UNIX) # there is a bug in the Syllable libraries which makes linking ccmake fail, Alex - if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES syllable) + if(NOT CMAKE_SYSTEM_NAME MATCHES syllable) set(CURSES_NEED_NCURSES TRUE) find_package(Curses QUIET) if (CURSES_LIBRARY) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index c3f77f4..f9405b3 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -451,7 +451,7 @@ if (WIN32) endif () # Watcom support -if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") +if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux") set_property(SOURCE cmake.cxx APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_USE_WMAKE) list(APPEND SRCS cmGlobalWatcomWMakeGenerator.cxx diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7242a00..128498c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1392,7 +1392,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Dependency") - if("${CMAKE_SYSTEM_NAME}" MATCHES syllable) + if(CMAKE_SYSTEM_NAME MATCHES syllable) # RPATH isn't supported under Syllable, so the tests don't # find their libraries. In order to fix that LIBRARY_OUTPUT_DIR |