diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-10 19:56:09 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-11-13 23:42:35 +0100 |
| commit | 1ae06e002da6535593e988e1148ce001bb2abc2d (patch) | |
| tree | b222884dffffb86342874e921eb31ff4c2388252 | |
| parent | 8bdecd36174f243fa9c9e05e6ed501f61ca2984f (diff) | |
CMake: Restore order-dependent header checks
Revert commit 1269df2e3b (Cmake: Don't check for all headers each
time, 2014-08-15) and add a comment explaining the purpose of the
original code.
The check_include_file_concat macro is intended to be called multiple
times on a sequence of possibly dependent headers. Later headers
may depend on earlier headers to provide declarations. They cannot
be safely included independently on some platforms.
For example, many POSIX APIs document including sys/types.h before some
other headers. Also on some OS X versions sys/socket.h must be included
before net/if.h or the check for the latter will fail.
Signed-off-by: Brad King <brad.king@kitware.com>
| -rw-r--r-- | CMake/Macros.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake index b07afc6ac..9b9338e52 100644 --- a/CMake/Macros.cmake +++ b/CMake/Macros.cmake @@ -11,8 +11,11 @@ macro(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) endmacro(CHECK_LIBRARY_EXISTS_CONCAT) # Check if header file exists and add it to the list. +# This macro is intended to be called multiple times with a sequence of +# possibly dependent header files. Some headers depend on others to be +# compiled correctly. macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) - check_include_file("${FILE}" ${VARIABLE}) + check_include_files("${CURL_INCLUDES};${FILE}" ${VARIABLE}) if(${VARIABLE}) set(CURL_INCLUDES ${CURL_INCLUDES} ${FILE}) set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -D${VARIABLE}") |