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 a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2 (commit)
via ff052f9ccbb188794c94caec70c266f6d6619da0 (commit)
from 41523a932cbc67eab2d39e781e5ac095f0d03fdd (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=a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2
commit a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2
Merge: 41523a9 ff052f9
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Thu Sep 3 14:29:29 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 3 14:29:29 2015 -0400
Merge topic 'apple-no-libnetwork' into next
ff052f9c Do not use libnetwork on Apple platforms
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff052f9ccbb188794c94caec70c266f6d6619da0
commit ff052f9ccbb188794c94caec70c266f6d6619da0
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Thu Sep 3 13:18:19 2015 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Thu Sep 3 20:28:38 2015 +0200
Do not use libnetwork on Apple platforms
Starting with OSX 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 OSX versions.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index d12c73f..f3a99d0 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -347,7 +347,9 @@ if(BEOS)
check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI)
endif(BEOS)
-check_library_exists_concat("network" recv HAVE_LIBNETWORK)
+if(NOT APPLE)
+ check_library_exists_concat("network" recv HAVE_LIBNETWORK)
+endif(NOT APPLE)
if(NOT NOT_NEED_LIBNSL)
check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL)
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmcurl/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
