diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-28 14:00:11 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-28 14:00:11 (GMT) |
| commit | f248295d5d8b3cc5d21150807885b0fc332c5d56 (patch) | |
| tree | 18cac230d08480b94b77e404991a74f2b04505ef /Modules | |
| parent | c472345346fc6be94299f40f13222b8c8f538abe (diff) | |
| download | CMake-f248295d5d8b3cc5d21150807885b0fc332c5d56.zip CMake-f248295d5d8b3cc5d21150807885b0fc332c5d56.tar.gz CMake-f248295d5d8b3cc5d21150807885b0fc332c5d56.tar.bz2 | |
ENH: fixes for optional flag arguments to check include macros
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckIncludeFile.cmake | 12 | ||||
| -rw-r--r-- | Modules/CheckIncludeFileCXX.cmake | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Modules/CheckIncludeFile.cmake b/Modules/CheckIncludeFile.cmake index 4c43081..c5e3475 100644 --- a/Modules/CheckIncludeFile.cmake +++ b/Modules/CheckIncludeFile.cmake @@ -13,12 +13,22 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c IMMEDIATE) MESSAGE(STATUS "Looking for ${INCLUDE}") + IF(${ARGC} EQUAL 3) + SET(CMAKE_C_FLAGS_SAVE ${CMAKE_C_FLAGS}) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARGV2}") + ENDIF(${ARGC} EQUAL 3) + TRY_COMPILE(${VARIABLE} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILE_FLAGS} - OUTPUT_VARIABLE OUTPUT) + OUTPUT_VARIABLE OUTPUT) + + IF(${ARGC} EQUAL 3) + SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS_SAVE}) + ENDIF(${ARGC} EQUAL 3) + IF(${VARIABLE}) MESSAGE(STATUS "Looking for ${INCLUDE} - found") SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}") diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake index 0fe6a5c..5f5811a 100644 --- a/Modules/CheckIncludeFileCXX.cmake +++ b/Modules/CheckIncludeFileCXX.cmake @@ -13,19 +13,19 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE}) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx IMMEDIATE) - IF(${ARGC} EQUAL 2) + IF(${ARGC} EQUAL 3) SET(CMAKE_CXX_FLAGS_SAVE ${CMAKE_CXX_FLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARGV2}") - ENDIF(${ARGC} EQUAL 2) + ENDIF(${ARGC} EQUAL 3) TRY_COMPILE(${VARIABLE} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx OUTPUT_VARIABLE OUTPUT) - IF(${ARGC} EQUAL 2) + IF(${ARGC} EQUAL 3) SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_SAVE}) - ENDIF(${ARGC} EQUAL 2) + ENDIF(${ARGC} EQUAL 3) IF(${VARIABLE}) MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- found") |