[Cmake-commits] CMake branch, next, updated. v2.8.7-2548-g3d606bb

Brad King brad.king at kitware.com
Thu Feb 9 14:32:03 EST 2012


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  3d606bbc5c28a54642cb57e2b2947c0483cf0335 (commit)
       via  ed14435b232a7e76678716b5a2a6694e7cade66c (commit)
       via  16b1a6e4e07b223c7ead20cd40346fc327e90569 (commit)
      from  a80db8077fe31f2be8692bcf145db0a7d69a9e8b (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=3d606bbc5c28a54642cb57e2b2947c0483cf0335
commit 3d606bbc5c28a54642cb57e2b2947c0483cf0335
Merge: a80db80 ed14435
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 9 14:31:54 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 9 14:31:54 2012 -0500

    Merge topic 'curl-CA-bundle' into next
    
    ed14435 Add CURL_CA_BUNDLE option for SSL support (#12946)
    16b1a6e KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed14435b232a7e76678716b5a2a6694e7cade66c
commit ed14435b232a7e76678716b5a2a6694e7cade66c
Author:     Artur Kedzierski <artur at kedzierski.org>
AuthorDate: Thu Feb 9 09:09:54 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 9 09:09:54 2012 -0500

    Add CURL_CA_BUNDLE option for SSL support (#12946)
    
    This adds the ability to specify the location of SSL CA bundle at
    compile time.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 7030b2e..1d50914 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -190,6 +190,11 @@ IF(CMAKE_USE_OPENSSL)
     CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
     CHECK_LIBRARY_EXISTS_CONCAT("ssl"    SSL_connect  HAVE_LIBSSL)
   ENDIF(WIN32)
+  SET(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle")
+  MARK_AS_ADVANCED(CURL_CA_BUNDLE)
+  IF(CURL_CA_BUNDLE)
+    ADD_DEFINITIONS(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}")
+  ENDIF(CURL_CA_BUNDLE)
 ENDIF(CMAKE_USE_OPENSSL)
 
 # Check for idn

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 Utilities/cmcurl/CMakeLists.txt   |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list