[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1179-gc6aad83

[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  c6aad8356f66067a17d7988bc039a86d37b12927 (commit)
       via  1bdad220b8ef1b335ab36dbf02987819de471214 (commit)
      from  de3c9d8c5f3bdda60c0711e04238fd392c46a59f (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=c6aad8356f66067a17d7988bc039a86d37b12927
commit c6aad8356f66067a17d7988bc039a86d37b12927
Merge: de3c9d8 1bdad22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 15 15:48:11 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 15 15:48:11 2014 -0500

    Merge topic 'curl-darwinssl' into next
    
    1bdad220 curl: Use OS X SSL/TLS native implementation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bdad220b8ef1b335ab36dbf02987819de471214
commit 1bdad220b8ef1b335ab36dbf02987819de471214
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 15 14:36:59 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 15 15:42:29 2014 -0500

    curl: Use OS X SSL/TLS native implementation
    
    On OS X, 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-darwinssl.rst b/Help/release/dev/curl-darwinssl.rst
new file mode 100644
index 0000000..3571bd1
--- /dev/null
+++ b/Help/release/dev/curl-darwinssl.rst
@@ -0,0 +1,9 @@
+curl-darwinssl
+--------------
+
+* On OS X, 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 OS X 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 1092e48..7fe19a1 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -464,6 +464,24 @@ elseif(WIN32)
   # Use Windows SSL/TLS native implementation.
   add_definitions(-DUSE_SCHANNEL)
   set(USE_WINDOWS_SSPI 1)
+elseif(APPLE)
+  # Use OS X SSL/TLS native implementation if available on target version.
+  if(CMAKE_OSX_DEPLOYMENT_TARGET)
+    set(OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
+  else()
+    execute_process(
+      COMMAND sw_vers -productVersion
+      OUTPUT_VARIABLE OSX_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  endif()
+  if(NOT OSX_VERSION VERSION_LESS 10.7)
+    add_definitions(-DUSE_DARWINSSL)
+    list(APPEND CURL_LIBS
+      "-framework CoreFoundation"
+      "-framework Security"
+      )
+  endif()
 endif()
 
 #libSSH2

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

Summary of changes:
 .../dev/{curl-winssl.rst => curl-darwinssl.rst}      |    8 ++++----
 Utilities/cmcurl/CMakeLists.txt                      |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 copy Help/release/dev/{curl-winssl.rst => curl-darwinssl.rst} (60%)


hooks/post-receive
-- 
CMake