kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-check-module-DEFINED-tests' 

4f2fcce4 Check*: Allow result variables to contain regex special characters (#14923)
This commit is contained in:
Brad King 2014-08-04 10:02:20 -04:00 committed by CMake Topic Stage
parent e0ff6def71 4f2fcce4b9
commit 506ed92c68
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CheckCSourceCompiles.cmake
View File

@ -39,7 +39,7 @@
macro(CHECK_C_SOURCE_COMPILES SOURCE VAR) macro(CHECK_C_SOURCE_COMPILES SOURCE VAR)
if("${VAR}" MATCHES "^${VAR}$") if(NOT DEFINED "${VAR}")
set(_FAIL_REGEX) set(_FAIL_REGEX)
set(_key) set(_key)
foreach(arg ${ARGN}) foreach(arg ${ARGN})

2
Modules/CheckCSourceRuns.cmake
View File

@ -39,7 +39,7 @@
macro(CHECK_C_SOURCE_RUNS SOURCE VAR) macro(CHECK_C_SOURCE_RUNS SOURCE VAR)
if("${VAR}" MATCHES "^${VAR}$") if(NOT DEFINED "${VAR}")
set(MACRO_CHECK_FUNCTION_DEFINITIONS set(MACRO_CHECK_FUNCTION_DEFINITIONS
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}") "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
if(CMAKE_REQUIRED_LIBRARIES) if(CMAKE_REQUIRED_LIBRARIES)

2
Modules/CheckCXXSourceCompiles.cmake
View File

@ -39,7 +39,7 @@
macro(CHECK_CXX_SOURCE_COMPILES SOURCE VAR) macro(CHECK_CXX_SOURCE_COMPILES SOURCE VAR)
if("${VAR}" MATCHES "^${VAR}$") if(NOT DEFINED "${VAR}")
set(_FAIL_REGEX) set(_FAIL_REGEX)
set(_key) set(_key)
foreach(arg ${ARGN}) foreach(arg ${ARGN})

2
Modules/CheckCXXSourceRuns.cmake
View File

@ -39,7 +39,7 @@
macro(CHECK_CXX_SOURCE_RUNS SOURCE VAR) macro(CHECK_CXX_SOURCE_RUNS SOURCE VAR)
if("${VAR}" MATCHES "^${VAR}$") if(NOT DEFINED "${VAR}")
set(MACRO_CHECK_FUNCTION_DEFINITIONS set(MACRO_CHECK_FUNCTION_DEFINITIONS
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}") "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
if(CMAKE_REQUIRED_LIBRARIES) if(CMAKE_REQUIRED_LIBRARIES)

2
Modules/CheckFunctionExists.cmake
View File

@ -38,7 +38,7 @@
macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
set(MACRO_CHECK_FUNCTION_DEFINITIONS set(MACRO_CHECK_FUNCTION_DEFINITIONS
"-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}")
if(NOT CMAKE_REQUIRED_QUIET) if(NOT CMAKE_REQUIRED_QUIET)

2
Modules/CheckIncludeFile.cmake
View File

@ -40,7 +40,7 @@
# License text for the above reference.) # License text for the above reference.)
macro(CHECK_INCLUDE_FILE INCLUDE VARIABLE) macro(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
if(CMAKE_REQUIRED_INCLUDES) if(CMAKE_REQUIRED_INCLUDES)
set(CHECK_INCLUDE_FILE_C_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") set(CHECK_INCLUDE_FILE_C_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
else() else()

2
Modules/CheckIncludeFileCXX.cmake
View File

@ -44,7 +44,7 @@
# License text for the above reference.) # License text for the above reference.)
macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
if(CMAKE_REQUIRED_INCLUDES) if(CMAKE_REQUIRED_INCLUDES)
set(CHECK_INCLUDE_FILE_CXX_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") set(CHECK_INCLUDE_FILE_CXX_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
else() else()

2
Modules/CheckIncludeFiles.cmake
View File

@ -39,7 +39,7 @@
# License text for the above reference.) # License text for the above reference.)
macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE) macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
if(CMAKE_REQUIRED_INCLUDES) if(CMAKE_REQUIRED_INCLUDES)
set(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") set(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")

2
Modules/CheckLibraryExists.cmake
View File

@ -41,7 +41,7 @@
macro(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) macro(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
set(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION set(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION
"-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}")
if(NOT CMAKE_REQUIRED_QUIET) if(NOT CMAKE_REQUIRED_QUIET)

2
Modules/CheckSymbolExists.cmake
View File

@ -50,7 +50,7 @@ macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
endmacro() endmacro()
macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE) macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
if(CMAKE_REQUIRED_LIBRARIES) if(CMAKE_REQUIRED_LIBRARIES)

2
Modules/CheckVariableExists.cmake
View File

@ -45,7 +45,7 @@
macro(CHECK_VARIABLE_EXISTS VAR VARIABLE) macro(CHECK_VARIABLE_EXISTS VAR VARIABLE)
if("${VARIABLE}" MATCHES "^${VARIABLE}$") if(NOT DEFINED "${VARIABLE}")
set(MACRO_CHECK_VARIABLE_DEFINITIONS set(MACRO_CHECK_VARIABLE_DEFINITIONS
"-DCHECK_VARIABLE_EXISTS=${VAR} ${CMAKE_REQUIRED_FLAGS}") "-DCHECK_VARIABLE_EXISTS=${VAR} ${CMAKE_REQUIRED_FLAGS}")
if(NOT CMAKE_REQUIRED_QUIET) if(NOT CMAKE_REQUIRED_QUIET)