From b338aad70c935ed2ce88ddb4b417276f23ad4224 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 4 Nov 2005 09:28:09 -0500
Subject: ENH: Cleanup and unify

---
 Modules/CheckIncludeFile.cmake    |  2 +-
 Modules/CheckIncludeFileCXX.cmake | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Modules/CheckIncludeFile.cmake b/Modules/CheckIncludeFile.cmake
index ecb6fdc..9429e70 100644
--- a/Modules/CheckIncludeFile.cmake
+++ b/Modules/CheckIncludeFile.cmake
@@ -39,7 +39,7 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
         "exists passed with the following output:\n"
         "${OUTPUT}\n\n")
     ELSE(${VARIABLE})
-      MESSAGE(STATUS "Looking for ${INCLUDE} - not found.")
+      MESSAGE(STATUS "Looking for ${INCLUDE} - not found")
       SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
       FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log 
         "Determining if the include file ${INCLUDE} "
diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake
index 9eb5d7d..1abaaa7 100644
--- a/Modules/CheckIncludeFileCXX.cmake
+++ b/Modules/CheckIncludeFileCXX.cmake
@@ -5,15 +5,16 @@
 # INCLUDE - name of include file
 # VARIABLE - variable to return result
 #
-# a third argument can be passed containing extra flags for the compiler
+# an optional third argument is the CFlags to add to the compile line 
+# or you can use CMAKE_REQUIRED_FLAGS
 #
-
 MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
   IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
-    MESSAGE(STATUS "Checking for CXX include file ${INCLUDE}")
+    SET(MACRO_CHECK_INCLUDE_FILE_FLAGS ${CMAKE_REQUIRED_FLAGS})
     SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
     CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
       ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx IMMEDIATE)
+    MESSAGE(STATUS "Looking for C++ include ${INCLUDE}")
     IF(${ARGC} EQUAL 3)
       SET(CMAKE_CXX_FLAGS_SAVE ${CMAKE_CXX_FLAGS})
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARGV2}")
@@ -22,21 +23,23 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
     TRY_COMPILE(${VARIABLE}
       ${CMAKE_BINARY_DIR}
       ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx
-      OUTPUT_VARIABLE OUTPUT)
+      CMAKE_FLAGS 
+      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILE_FLAGS}
+      OUTPUT_VARIABLE OUTPUT) 
 
     IF(${ARGC} EQUAL 3)
       SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_SAVE})
     ENDIF(${ARGC} EQUAL 3)
 
     IF(${VARIABLE})
-      MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- found")
+      MESSAGE(STATUS "Looking for C++ include ${INCLUDE} - found")
       SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
       FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log 
         "Determining if the include file ${INCLUDE} "
         "exists passed with the following output:\n"
         "${OUTPUT}\n\n")
     ELSE(${VARIABLE})
-      MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- not found")
+      MESSAGE(STATUS "Looking for C++ include ${INCLUDE} - not found")
       SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
       FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log 
         "Determining if the include file ${INCLUDE} "
-- 
cgit v0.12