[Cmake-commits] CMake branch, next, updated. v3.3.1-2838-g7c567af

[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  7c567af0e6a5062043f80e04a16ef64db5bff754 (commit)
       via  01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f (commit)
      from  0c2bfcf32048db82050c15bed36cb0419799b9c1 (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=7c567af0e6a5062043f80e04a16ef64db5bff754
commit 7c567af0e6a5062043f80e04a16ef64db5bff754
Merge: 0c2bfcf 01b6ecd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 11:26:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 10 11:26:25 2015 -0400

    Merge topic 'apple-no-libnetwork' into next
    
    01b6ecdb curl: Do not use libnetwork on Apple platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f
commit 01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Thu Sep 3 13:18:19 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 10 11:25:42 2015 -0400

    curl: Do not use libnetwork on Apple platforms
    
    Starting with OS X 10.11 there is a library called libnetwork
    which will be picked up during curl configuration.
    This breaks backward compatibility of the resulting binaries
    because libnetwork is not available on older OS X versions.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index d12c73f..39b70c0 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -43,6 +43,14 @@ if(WIN32)
   set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton")
 endif()
 
+# Starting with OSX 10.11 there is an unrelated libnetwork library which will
+# be picked up during curl configuration. Linking against this library is
+# unnecessary and breaks backward compatibility of the resulting binaries
+# because libnetwork is unavailable on older OSX versions.
+if(APPLE)
+  set(HAVE_LIBNETWORK 0 CACHE INTERNAL "Do not use libnetwork")
+endif(APPLE)
+
 # Disable warnings to avoid changing 3rd party code.
 if(CMAKE_C_COMPILER_ID MATCHES
     "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")

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

Summary of changes:


hooks/post-receive
-- 
CMake