[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1151-gd5df322

[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  d5df32261c864bf3bcff71c63d65324a7229ad63 (commit)
       via  ba8c6632194256a6a3370713d8e0423ad516361a (commit)
      from  288909421dc5cc1556c3f51ca497bb87b738f971 (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=d5df32261c864bf3bcff71c63d65324a7229ad63
commit d5df32261c864bf3bcff71c63d65324a7229ad63
Merge: 2889094 ba8c663
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 13:59:51 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 13:59:51 2014 -0500

    Merge topic 'curl-winssl' into next
    
    ba8c6632 curl: Use Windows SSL/TLS native implementation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba8c6632194256a6a3370713d8e0423ad516361a
commit ba8c6632194256a6a3370713d8e0423ad516361a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 13:29:54 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 12 13:52:46 2014 -0500

    curl: Use Windows SSL/TLS native implementation
    
    On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation.
    This will allow the OS-configured CA list to be trusted automatically.

diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst
new file mode 100644
index 0000000..9a28f4f
--- /dev/null
+++ b/Help/release/dev/curl-winssl.rst
@@ -0,0 +1,9 @@
+curl-winssl
+-----------
+
+* On Windows, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The Windows native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index eaf276b..1092e48 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -460,7 +460,11 @@ if(CMAKE_USE_OPENSSL)
       add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}")
     endif()
   endif(OPENSSL_FOUND)
-endif(CMAKE_USE_OPENSSL)
+elseif(WIN32)
+  # Use Windows SSL/TLS native implementation.
+  add_definitions(-DUSE_SCHANNEL)
+  set(USE_WINDOWS_SSPI 1)
+endif()
 
 #libSSH2
 option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON)

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

Summary of changes:
 Help/release/dev/curl-winssl.rst |    9 +++++++++
 Utilities/cmcurl/CMakeLists.txt  |    6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/curl-winssl.rst


hooks/post-receive
-- 
CMake