diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-19 13:48:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-19 13:48:39 (GMT) |
| commit | eea6103c10a697f727cb4638e36b5cd72eff749c (patch) | |
| tree | 6874d8d45ded61732cb963228830a814813368f9 /Modules | |
| parent | ceaf578e02a723a62a308515b875244355e85ef6 (diff) | |
| parent | 4ffec8f666b996aedd592e6d26286cef2cb38b50 (diff) | |
| download | CMake-eea6103c10a697f727cb4638e36b5cd72eff749c.zip CMake-eea6103c10a697f727cb4638e36b5cd72eff749c.tar.gz CMake-eea6103c10a697f727cb4638e36b5cd72eff749c.tar.bz2 | |
Merge topic 'fix-check-module-DEFINED-tests'
4ffec8f6 Check*: Add compatibility hack for old VXL code
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckFunctionExists.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckIncludeFileCXX.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckSymbolExists.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake index 01a652b..4c4334f 100644 --- a/Modules/CheckFunctionExists.cmake +++ b/Modules/CheckFunctionExists.cmake @@ -38,7 +38,7 @@ macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) - if(NOT DEFINED "${VARIABLE}") + if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}") set(MACRO_CHECK_FUNCTION_DEFINITIONS "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") if(NOT CMAKE_REQUIRED_QUIET) diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake index 718e667..eff982c 100644 --- a/Modules/CheckIncludeFileCXX.cmake +++ b/Modules/CheckIncludeFileCXX.cmake @@ -44,7 +44,7 @@ # License text for the above reference.) macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) - if(NOT DEFINED "${VARIABLE}") + if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}") if(CMAKE_REQUIRED_INCLUDES) set(CHECK_INCLUDE_FILE_CXX_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") else() diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake index 6f50c88..c31f6b6 100644 --- a/Modules/CheckSymbolExists.cmake +++ b/Modules/CheckSymbolExists.cmake @@ -50,7 +50,7 @@ macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE) endmacro() macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE) - if(NOT DEFINED "${VARIABLE}") + if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}") set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) if(CMAKE_REQUIRED_LIBRARIES) |