From 668b3f3cea574a48240242c64e45300965f8bb84 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 3 Jan 2003 20:03:35 -0500
Subject: Fix problems with required flags

---
 Modules/CheckFunctionExists.cmake | 4 ++--
 Modules/CheckLibraryExists.cmake  | 4 ++--
 Modules/CheckTypeSize.cmake       | 5 +++--
 Modules/CheckVariableExists.cmake | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'Modules')

diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake
index 7d692385c8..191bd5e4b3 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 e206a7c1f8..ea223d3c29 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 08d1a203c0..db4dfdb070 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 1635b5de86..57b89c8869 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 
-- 
cgit v1.2.1