[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-403-gb67cd97

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b67cd9793939d61318794583811d4539a2c12b4b (commit)
       via  67c05f988bde7ff47f1da767a20c1a9f1e771884 (commit)
      from  e459c5bc57f9ffc784a67ea04d207c1fe0d2f301 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b67cd9793939d61318794583811d4539a2c12b4b
commit b67cd9793939d61318794583811d4539a2c12b4b
Merge: e459c5b 67c05f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 22:24:27 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 22:24:27 2014 -0500

    Merge topic 'update-curl' into next
    
    67c05f98 curl: Fix detection of headers with dependencies


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67c05f988bde7ff47f1da767a20c1a9f1e771884
commit 67c05f988bde7ff47f1da767a20c1a9f1e771884
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 22:22:11 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 6 22:22:11 2014 -0500

    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.

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}")

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmcurl/CMake/Macros.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake