[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1181-gddf17d5

[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  ddf17d549972cb0fa229f62915ebac916cff4ac0 (commit)
       via  697aa25068fe008008ff7aac934a852774218245 (commit)
      from  c6aad8356f66067a17d7988bc039a86d37b12927 (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=ddf17d549972cb0fa229f62915ebac916cff4ac0
commit ddf17d549972cb0fa229f62915ebac916cff4ac0
Merge: c6aad83 697aa25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 09:46:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 16 09:46:29 2014 -0500

    Merge topic 'curl-darwinssl' into next
    
    697aa250 curl: DarwinSSL works on OS X 10.5 and above with GNU and Clang


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=697aa25068fe008008ff7aac934a852774218245
commit 697aa25068fe008008ff7aac934a852774218245
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 09:37:20 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 09:45:49 2014 -0500

    curl: DarwinSSL works on OS X 10.5 and above with GNU and Clang
    
    It does not work with the Intel compiler.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 7fe19a1..94aafb9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -475,7 +475,8 @@ elseif(APPLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
   endif()
-  if(NOT OSX_VERSION VERSION_LESS 10.7)
+  if(NOT OSX_VERSION VERSION_LESS 10.5 AND
+     CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
     add_definitions(-DUSE_DARWINSSL)
     list(APPEND CURL_LIBS
       "-framework CoreFoundation"

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

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


hooks/post-receive
-- 
CMake