summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-07 03:22:11 (GMT)
committerBrad King <brad.king@kitware.com>2014-11-10 15:13:37 (GMT)
commit1f7cb7e27bac9b18834402ccff30685f69dd838c (patch)
tree0f009504ddd9b50410c64d6c4e0b7ec453d81aaa /Utilities
parentb18c9044122b0fbe7cc6c81efb48d0be8e065a23 (diff)
downloadCMake-1f7cb7e27bac9b18834402ccff30685f69dd838c.zip
CMake-1f7cb7e27bac9b18834402ccff30685f69dd838c.tar.gz
CMake-1f7cb7e27bac9b18834402ccff30685f69dd838c.tar.bz2
curl: Fix detection of headers with dependencies
Restore the check_include_file_concat functionality broken in upstream curl. The <net/if.h> header on older OS X versions depends on <sys/socket.h> begin included first, for example.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/CMake/Macros.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmcurl/CMake/Macros.cmake b/Utilities/cmcurl/CMake/Macros.cmake
index c770a55..0f8eb57 100644
--- a/Utilities/cmcurl/CMake/Macros.cmake
+++ b/Utilities/cmcurl/CMake/Macros.cmake
@@ -12,7 +12,7 @@ endmacro(CHECK_LIBRARY_EXISTS_CONCAT)
# Check if header file exists and add it to the list.
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}")