[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 28/205: CMake: Add DarwinSSL support
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 28/205: CMake: Add DarwinSSL support |
Date: |
Thu, 20 Apr 2017 16:19:28 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit eb19e89f2e9325b75e0e9ec05da37dc4d9f6fd7f
Author: Michael Maltese <address@hidden>
AuthorDate: Wed Jan 25 16:05:07 2017 -0800
CMake: Add DarwinSSL support
Assisted-by: Simon Warta <address@hidden>
Ref: https://github.com/curl/curl/pull/1228
---
CMakeLists.txt | 12 ++++++++----
lib/curl_config.h.cmake | 3 +++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 922e11386..47d4cecd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,8 +295,11 @@ if(WIN32)
endif()
# check SSL libraries
-# TODO support GNUTLS, NSS, POLARSSL, AXTLS, CYASSL, DARWINSSL
+# TODO support GNUTLS, NSS, POLARSSL, AXTLS, CYASSL
+if(APPLE)
+ option(CMAKE_USE_DARWINSSL "enable Apple OS native SSL/TLS" OFF)
+endif()
if(WIN32)
option(CMAKE_USE_WINSSL "enable Windows native SSL/TLS" OFF)
cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow
NTLM authentication without openssl" ON
@@ -320,7 +323,7 @@ if(CURL_WINDOWS_SSPI)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}
-DSECURITY_WIN32")
endif()
-if(CMAKE_USE_DARWINSSL)
+if(CMAKE_USE_DARWINSSL AND NOT SSL_ENABLED)
find_library(COREFOUNDATION_FRAMEWORK "CoreFoundation")
if(NOT COREFOUNDATION_FRAMEWORK)
message(FATAL_ERROR "CoreFoundation framework not found")
@@ -1083,6 +1086,7 @@ endfunction()
set(_items)
_add_if("WinSSL" SSL_ENABLED AND USE_WINDOWS_SSPI)
_add_if("OpenSSL" SSL_ENABLED AND USE_OPENSSL)
+_add_if("DarwinSSL" SSL_ENABLED AND USE_DARWINSSL)
_add_if("IPv6" ENABLE_IPV6)
_add_if("unix-sockets" USE_UNIX_SOCKETS)
_add_if("libz" HAVE_LIBZ)
@@ -1099,9 +1103,9 @@ _add_if("SPNEGO" NOT CURL_DISABLE_CRYPTO_AUTH AND
_add_if("Kerberos" NOT CURL_DISABLE_CRYPTO_AUTH AND
(HAVE_GSSAPI OR USE_WINDOWS_SSPI))
# NTLM support requires crypto function adaptions from various SSL libs
-# TODO alternative SSL libs tests for SSP1, GNUTLS, NSS, DARWINSSL
+# TODO alternative SSL libs tests for SSP1, GNUTLS, NSS
if(NOT CURL_DISABLE_CRYPTO_AUTH AND (USE_OPENSSL OR
- USE_WINDOWS_SSPI OR GNUTLS_ENABLED OR NSS_ENABLED OR DARWINSSL_ENABLED))
+ USE_WINDOWS_SSPI OR GNUTLS_ENABLED OR NSS_ENABLED OR USE_DARWINSSL))
_add_if("NTLM" 1)
# TODO missing option (autoconf: --enable-ntlm-wb)
_add_if("NTLM_WB" NOT CURL_DISABLE_HTTP AND NTLM_WB_ENABLED)
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 49c1b8a2d..9fcdd97f9 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -927,6 +927,9 @@
/* if PolarSSL is enabled */
#cmakedefine USE_POLARSSL 1
+/* if DarwinSSL is enabled */
+#cmakedefine USE_DARWINSSL 1
+
/* if mbedTLS is enabled */
#cmakedefine USE_MBEDTLS 1
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 32/205: BINDINGS: add misssing C++ bindings, (continued)
- [GNUnet-SVN] [gnurl] 32/205: BINDINGS: add misssing C++ bindings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 29/205: CMake: Add mbedTLS support, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 25/205: fix potential use of uninitialized variables, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 35/205: BINDINGS: update the Lua-cURL URL, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 17/205: configure: fix for --enable-pthreads, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 33/205: BINDINGS: add go-curl and perl6-net-curl, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 21/205: build: fix gcc7 implicit fallthrough warnings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 26/205: CURLOPT_SSL_CTX_FUNCTION.3: Fix EXAMPLE formatting errors, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 30/205: CMake: Set at most one SSL library, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 27/205: CMake: Reorganize SSL support, separate WinSSL and SSPI, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 28/205: CMake: Add DarwinSSL support,
gnunet <=
- [GNUnet-SVN] [gnurl] 34/205: BINDINGS: add Scilab binding, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 40/205: ares: Curl_resolver_wait_resolv: clear *entry first in function, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 07/205: docs: de-duplicate file lists in the Makefiles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 18/205: checksrc.bat: Ignore curl_config.h.in, curl_config.h, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 44/205: Makefile.am: Remove distribution man pages when running 'make clean', gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 38/205: KNOWN_BUGS: Add DarwinSSL won't import PKCS#12 without a password, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 54/205: polarssl: fixed compile errors introduced in 6448f98c, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 50/205: RELEASE-NOTES: synced with 6888a670aa01, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 23/205: tests: fixed a typo in some comments, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 56/205: build: fixed making man page in out-of-tree tarball builds, gnunet, 2017/04/20