[Cmake-commits] CMake branch, next, updated. v3.3.1-2822-g34141ce

[Gregor Jasny]

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  34141ce58174d8180359bd95389c25255e8cf2b7 (commit)
       via  86a032131804072d41d80d57cd569657372109ab (commit)
      from  8d31860874ab4968b69ea93d6240fa66fe1bb60c (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=34141ce58174d8180359bd95389c25255e8cf2b7
commit 34141ce58174d8180359bd95389c25255e8cf2b7
Merge: 8d31860 86a0321
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Sep 9 15:52:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 9 15:52:46 2015 -0400

    Merge topic 'apple-no-libnetwork' into next
    
    86a03213 fixup! Do not use libnetwork on Apple platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86a032131804072d41d80d57cd569657372109ab
commit 86a032131804072d41d80d57cd569657372109ab
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Sep 9 21:37:58 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Wed Sep 9 21:40:13 2015 +0200

    fixup! Do not use libnetwork on Apple platforms

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index f3a99d0..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)$")
@@ -347,9 +355,7 @@ if(BEOS)
   check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI)
 endif(BEOS)
 
-if(NOT APPLE)
-  check_library_exists_concat("network" recv HAVE_LIBNETWORK)
-endif(NOT APPLE)
+check_library_exists_concat("network" recv HAVE_LIBNETWORK)
 
 if(NOT NOT_NEED_LIBNSL)
   check_library_exists_concat("nsl"    gethostbyname  HAVE_LIBNSL)

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

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


hooks/post-receive
-- 
CMake