[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1202-g2177c44

Brad King brad.king at kitware.com
Wed Dec 17 09:30:19 EST 2014


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  2177c44cdbced14775ba1525c90f5d322b83dee4 (commit)
       via  84e0a079c5a03bd6d5c6be186b8c3ba8e443d53c (commit)
      from  7f64cc5880012743332070bc908fa875ede019e4 (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=2177c44cdbced14775ba1525c90f5d322b83dee4
commit 2177c44cdbced14775ba1525c90f5d322b83dee4
Merge: 7f64cc5 84e0a07
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 09:30:18 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 17 09:30:18 2014 -0500

    Merge topic 'curl-darwinssl' into next
    
    84e0a079 curl: DarwinSSL works on OS X 10.6 and above


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e0a079c5a03bd6d5c6be186b8c3ba8e443d53c
commit 84e0a079c5a03bd6d5c6be186b8c3ba8e443d53c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 09:29:18 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 09:29:18 2014 -0500

    curl: DarwinSSL works on OS X 10.6 and above
    
    On 10.5 it fails to link _SecTrustSetAnchorCertificatesOnly
    and a few other symbols.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 94aafb9..0db741e 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -475,7 +475,7 @@ elseif(APPLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
   endif()
-  if(NOT OSX_VERSION VERSION_LESS 10.5 AND
+  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

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

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list