Browse Source

try to fix check for ansi stream

Bill Hoffman 23 years ago
parent
commit
1e3ddfeecf
2 changed files with 6 additions and 7 deletions
  1. 3 0
      Modules/CheckIncludeFileCXX.cmake
  2. 3 7
      Modules/TestForANSIStreamHeaders.cmake

+ 3 - 0
Modules/CheckIncludeFileCXX.cmake

@@ -7,6 +7,7 @@
 #
 
 MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
+  MESSAGE(STATUS "Checking for CXX include file ${INCLUDE}")
   SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
   CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
                  ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx IMMEDIATE)
@@ -16,8 +17,10 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
              CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS}
              OUTPUT_VARIABLE OUTPUT)
   IF(${VARIABLE})
+    MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- found")
     SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
   ELSE(${VARIABLE})
+    MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- not found")
     SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}")
     WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log 
       "Determining if the include file ${INCLUDE} "

+ 3 - 7
Modules/TestForANSIStreamHeaders.cmake

@@ -3,18 +3,14 @@
 #
 # CMAKE_NO_ANSI_STREAM_HEADERS - defined accoreding to the results
 #
+INCLUDE(${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
 
 IF(NOT CMAKE_NO_ANSI_STREAM_HEADERS)
-  MESSAGE(STATUS "Check for ANSI stream headers")
-  TRY_COMPILE(CMAKE_ANSI_STREAM_HEADERS  ${PROJECT_BINARY_DIR} 
-    ${CMAKE_ROOT}/Modules/TestForANSIStreamHeaders.cxx 
-    CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS})
+  CHECK_INCLUDE_FILE_CXX(iostream CMAKE_ANSI_STREAM_HEADERS)
   IF (CMAKE_ANSI_STREAM_HEADERS)
-    MESSAGE(STATUS "Check for ANSI stream headers - found")
     SET (CMAKE_NO_ANSI_STREAM_HEADERS 0 CACHE INTERNAL 
          "Does the compiler support headers like iostream.")
-  ELSE (CMAKE_ANSI_STREAM_HEADERS)
-    MESSAGE(STATUS "Check for ANSI stream headers - not found")
+  ELSE (CMAKE_ANSI_STREAM_HEADERS)   
     SET (CMAKE_NO_ANSI_STREAM_HEADERS 1 CACHE INTERNAL 
        "Does the compiler support headers like iostream.")
   ENDIF (CMAKE_ANSI_STREAM_HEADERS)