diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-15 14:27:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-15 14:27:36 (GMT) |
| commit | 9edf6903e62f84a567db3938bb8fec3f19789545 (patch) | |
| tree | 889b2078804ab5f74e8e76a9e4000b9dc27479d5 /Modules | |
| parent | 78884b6effcb5406eb64365d6cf4b43c085f56c3 (diff) | |
| parent | 858d5a0b3e52dbae635fac5a6944fba23a362f5b (diff) | |
| download | CMake-9edf6903e62f84a567db3938bb8fec3f19789545.zip CMake-9edf6903e62f84a567db3938bb8fec3f19789545.tar.gz CMake-9edf6903e62f84a567db3938bb8fec3f19789545.tar.bz2 | |
Merge topic 'if-sanity'
858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin
e177e7af FPHSA: Avoid if() dereferencing of quoted variable
425acc52 cmcurl: Use if(DEFINED) to simplify conditions
cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable
2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable
0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions
188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if()
b900c1cc If: Extract cmConditionEvaluator from if() implementation
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPackageHandleStandardArgs.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestBigEndian.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestForANSIForScope.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestForSSTREAM.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestForSTDNamespace.cmake | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 67dc0eb..72bb8eb 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -527,7 +527,7 @@ function(_GTK2_ADD_TARGET _var) set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}_INCLUDE_DIR}") endif() - if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "GTK2_${_var}_INCLUDE_DIR") + if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "x${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "x${GTK2_${_var}_INCLUDE_DIR}") set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}") endif() diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake index d030418..e8d1dfb 100644 --- a/Modules/FindPackageHandleStandardArgs.cmake +++ b/Modules/FindPackageHandleStandardArgs.cmake @@ -201,7 +201,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) # now that we collected all arguments, process them - if("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG") + if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG") set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}") endif() diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 6f32b08..fcb41ab 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -25,7 +25,7 @@ # License text for the above reference.) macro(TEST_BIG_ENDIAN VARIABLE) - if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") + if(NOT DEFINED HAVE_${VARIABLE}) message(STATUS "Check if the system is big endian") message(STATUS "Searching 16 bit integer") diff --git a/Modules/TestForANSIForScope.cmake b/Modules/TestForANSIForScope.cmake index de4b1f1..78fff9f 100644 --- a/Modules/TestForANSIForScope.cmake +++ b/Modules/TestForANSIForScope.cmake @@ -24,7 +24,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -if("CMAKE_ANSI_FOR_SCOPE" MATCHES "^CMAKE_ANSI_FOR_SCOPE$") +if(NOT DEFINED CMAKE_ANSI_FOR_SCOPE) message(STATUS "Check for ANSI scope") try_compile(CMAKE_ANSI_FOR_SCOPE ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx diff --git a/Modules/TestForSSTREAM.cmake b/Modules/TestForSSTREAM.cmake index 8977583..fe18ea2 100644 --- a/Modules/TestForSSTREAM.cmake +++ b/Modules/TestForSSTREAM.cmake @@ -23,7 +23,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -if("CMAKE_HAS_ANSI_STRING_STREAM" MATCHES "^CMAKE_HAS_ANSI_STRING_STREAM$") +if(NOT DEFINED CMAKE_HAS_ANSI_STRING_STREAM) message(STATUS "Check for sstream") try_compile(CMAKE_HAS_ANSI_STRING_STREAM ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestForSSTREAM.cxx diff --git a/Modules/TestForSTDNamespace.cmake b/Modules/TestForSTDNamespace.cmake index e43b75d..0d90774 100644 --- a/Modules/TestForSTDNamespace.cmake +++ b/Modules/TestForSTDNamespace.cmake @@ -23,7 +23,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -if("CMAKE_STD_NAMESPACE" MATCHES "^CMAKE_STD_NAMESPACE$") +if(NOT DEFINED CMAKE_STD_NAMESPACE) message(STATUS "Check for STD namespace") try_compile(CMAKE_STD_NAMESPACE ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestForSTDNamespace.cxx |