[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-693-g7c767fe

[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  7c767fe68dc8270f2e84f59071fc6562734198c7 (commit)
       via  46bbf947837f408cb7d5bd147e078e86541a3103 (commit)
      from  f0771cbfc800aa2cba5b25f53eaffac54569a2c7 (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=7c767fe68dc8270f2e84f59071fc6562734198c7
commit 7c767fe68dc8270f2e84f59071fc6562734198c7
Merge: f0771cb 46bbf94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 17 09:57:08 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 17 09:57:08 2014 -0500

    Merge topic 'update-curl' into next
    
    46bbf947 curl: Check for OpenSSL headers independently


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46bbf947837f408cb7d5bd147e078e86541a3103
commit 46bbf947837f408cb7d5bd147e078e86541a3103
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 17 09:52:42 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 17 09:52:49 2014 -0500

    curl: Check for OpenSSL headers independently
    
    Use check_include_file instead of check_include_file_concat to look
    for OpenSSL headers.  They do not need to participate in a sequence
    of dependent system headers.  Also they may cause winsock.h to be
    included before ws2tcpip.h, causing the latter to not be detected
    in the sequence.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index c4a930e..eaf276b 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -443,15 +443,15 @@ if(CMAKE_USE_OPENSSL)
     set(HAVE_LIBSSL ON)
     include_directories(${OPENSSL_INCLUDE_DIR})
     set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-    check_include_file_concat("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H)
-    check_include_file_concat("openssl/engine.h" HAVE_OPENSSL_ENGINE_H)
-    check_include_file_concat("openssl/err.h"    HAVE_OPENSSL_ERR_H)
-    check_include_file_concat("openssl/pem.h"    HAVE_OPENSSL_PEM_H)
-    check_include_file_concat("openssl/pkcs12.h" HAVE_OPENSSL_PKCS12_H)
-    check_include_file_concat("openssl/rsa.h"    HAVE_OPENSSL_RSA_H)
-    check_include_file_concat("openssl/ssl.h"    HAVE_OPENSSL_SSL_H)
-    check_include_file_concat("openssl/x509.h"   HAVE_OPENSSL_X509_H)
-    check_include_file_concat("openssl/rand.h"   HAVE_OPENSSL_RAND_H)
+    check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H)
+    check_include_file("openssl/engine.h" HAVE_OPENSSL_ENGINE_H)
+    check_include_file("openssl/err.h"    HAVE_OPENSSL_ERR_H)
+    check_include_file("openssl/pem.h"    HAVE_OPENSSL_PEM_H)
+    check_include_file("openssl/pkcs12.h" HAVE_OPENSSL_PKCS12_H)
+    check_include_file("openssl/rsa.h"    HAVE_OPENSSL_RSA_H)
+    check_include_file("openssl/ssl.h"    HAVE_OPENSSL_SSL_H)
+    check_include_file("openssl/x509.h"   HAVE_OPENSSL_X509_H)
+    check_include_file("openssl/rand.h"   HAVE_OPENSSL_RAND_H)
 
     # Optionally build with a specific CA cert bundle.
     set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle")

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

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake