summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-10 15:29:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-10 15:29:50 (GMT)
commite07e02d8c0fab3d952c2e87fc7a916c139292645 (patch)
treec8f6ecad120c867b9ea132362d10e6cc66b4054a
parent51ec922223ecc6cc4bf06dec680719c36944cadc (diff)
parent01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f (diff)
downloadCMake-e07e02d8c0fab3d952c2e87fc7a916c139292645.zip
CMake-e07e02d8c0fab3d952c2e87fc7a916c139292645.tar.gz
CMake-e07e02d8c0fab3d952c2e87fc7a916c139292645.tar.bz2
Merge topic 'apple-no-libnetwork'
01b6ecdb curl: Do not use libnetwork on Apple platforms
-rw-r--r--Utilities/cmcurl/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
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)$")