Commit f248295d authored by Bill Hoffman's avatar Bill Hoffman

ENH: fixes for optional flag arguments to check include macros

parent c4723453
......@@ -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}")
......
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment