[Cmake-commits] CMake branch, next, updated. v3.1.0-1235-gaecde43

[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  aecde43f487e84cd72b74713b4f2eabf4afb05c1 (commit)
       via  e4563257ba66266017fadf24c1b97fd103a138e4 (commit)
      from  01eb6be389e2e57838150f6b1ba73b3f67bd6fa5 (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=aecde43f487e84cd72b74713b4f2eabf4afb05c1
commit aecde43f487e84cd72b74713b4f2eabf4afb05c1
Merge: 01eb6be e456325
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:10:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 10:10:29 2014 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4563257ba66266017fadf24c1b97fd103a138e4
commit e4563257ba66266017fadf24c1b97fd103a138e4
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: Thu Dec 18 09:44:19 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.
    
    This is supported on OS X 10.6 and above using AppleClang, Clang, and
    GNU compilers.

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..0db741e 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -464,6 +464,25 @@ 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.6 AND
+     CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
+    add_definitions(-DUSE_DARWINSSL)
+    list(APPEND CURL_LIBS
+      "-framework CoreFoundation"
+      "-framework Security"
+      )
+  endif()
 endif()
 
 #libSSH2

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

Summary of changes:


hooks/post-receive
-- 
CMake