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 /CMakeCPack.cmake | |
| 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.
Diffstat (limited to 'CMakeCPack.cmake')
| -rw-r--r-- | CMakeCPack.cmake | 2 |
1 files changed, 1 insertions, 1 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}) |