From 0b12815dc2feeb328a86b77328d13a328368d38b Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 8 Sep 2014 09:58:33 -0400 Subject: [PATCH] Modules/Test*.cmake: Use if(DEFINED) to simplify conditions Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'. --- Modules/TestBigEndian.cmake | 2 +- Modules/TestForANSIForScope.cmake | 2 +- Modules/TestForSSTREAM.cmake | 2 +- Modules/TestForSTDNamespace.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 6f32b0852..fcb41abe1 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 de4b1f177..78fff9f74 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 8977583a9..fe18ea2a7 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 e43b75df6..0d907744a 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