diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-01-04 01:03:35 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-01-04 01:03:35 (GMT) |
| commit | 668b3f3cea574a48240242c64e45300965f8bb84 (patch) | |
| tree | 58c1fab399bf139235bfc09ef9dec3096a52ca39 | |
| parent | e720b84d6b6622a0e8780bd87fc9d364658de3f0 (diff) | |
| download | CMake-668b3f3cea574a48240242c64e45300965f8bb84.zip CMake-668b3f3cea574a48240242c64e45300965f8bb84.tar.gz CMake-668b3f3cea574a48240242c64e45300965f8bb84.tar.bz2 | |
Fix problems with required flags
| -rw-r--r-- | Modules/CheckFunctionExists.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckLibraryExists.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckTypeSize.cmake | 5 | ||||
| -rw-r--r-- | Modules/CheckVariableExists.cmake | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake index 7d69238..191bd5e 100644 --- a/Modules/CheckFunctionExists.cmake +++ b/Modules/CheckFunctionExists.cmake @@ -8,8 +8,8 @@ MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(MACRO_CHECK_FUNCTION_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION} - ${CMAKE_REQUIRED_FLAGS}) + SET(MACRO_CHECK_FUNCTION_DEFINITIONS + "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") MESSAGE(STATUS "Looking for ${FUNCTION}") IF(CMAKE_REQUIRED_LIBRARIES) SET(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES diff --git a/Modules/CheckLibraryExists.cmake b/Modules/CheckLibraryExists.cmake index e206a7c..ea223d3 100644 --- a/Modules/CheckLibraryExists.cmake +++ b/Modules/CheckLibraryExists.cmake @@ -8,8 +8,8 @@ MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION -DCHECK_FUNCTION_EXISTS=${FUNCTION} - ${CMAKE_REQUIRED_FLAGS}) + SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION + "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}") MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY}") SET(CHECK_LIBRARY_EXISTS_LIBRARIES ${LIBRARY}) IF(CMAKE_REQUIRED_LIBRARIES) diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake index 08d1a20..db4dfdb 100644 --- a/Modules/CheckTypeSize.cmake +++ b/Modules/CheckTypeSize.cmake @@ -8,8 +8,8 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(MACRO_CHECK_TYPE_SIZE_FLAGS -DCHECK_TYPE_SIZE_TYPE="${TYPE}" - ${CMAKE_REQUIRED_FLAGS}) + SET(MACRO_CHECK_TYPE_SIZE_FLAGS + "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}") IF(HAVE_SYS_TYPES_H) SET(MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -DHAVE_SYS_TYPES_H") @@ -18,6 +18,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) SET(MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -DHAVE_STDINT_H") ENDIF(HAVE_STDINT_H) MESSAGE(STATUS "Check size of ${TYPE}") + MESSAGE(STATUS "Flags: ${MACRO_CHECK_TYPE_SIZE_FLAGS}") IF(CMAKE_REQUIRED_LIBRARIES) SET(CHECK_TYPE_SIZE_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") diff --git a/Modules/CheckVariableExists.cmake b/Modules/CheckVariableExists.cmake index 1635b5d..57b89c8 100644 --- a/Modules/CheckVariableExists.cmake +++ b/Modules/CheckVariableExists.cmake @@ -7,8 +7,8 @@ MACRO(CHECK_VARIABLE_EXISTS VAR VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(MACRO_CHECK_VARIABLE_DEFINITIONS -DCHECK_VARIABLE_EXISTS=${VAR} - ${CMAKE_REQUIRED_FLAGS}) + SET(MACRO_CHECK_VARIABLE_DEFINITIONS + "-DCHECK_VARIABLE_EXISTS=${VAR} ${CMAKE_REQUIRED_FLAGS}") MESSAGE(STATUS "Looking for ${VARIABLE}") IF(CMAKE_REQUIRED_LIBRARIES) SET(CHECK_VARIABLE_EXISTS_ADD_LIBRARIES |