Unverified Commit dc5ac786 authored by Simon Warta's avatar Simon Warta Committed by Marcel Raad
Browse files

cmake: rename CMAKE_USE_DARWINSSL to CMAKE_USE_SECTRANSP 

Closes https://github.com/curl/curl/pull/3769
parent e7d3f65a

CMakeLists.txt

+13 −9
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ endif() 
# TODO support GNUTLS, NSS, POLARSSL, CYASSL



if(APPLE)

  option(CMAKE_USE_DARWINSSL "enable Apple OS native SSL/TLS" OFF)

  option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF)

endif()

if(WIN32)

  option(CMAKE_USE_WINSSL "enable Windows native SSL/TLS" OFF)
@@ -297,14 +297,14 @@ endif() 
option(CMAKE_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF)



set(openssl_default ON)

if(WIN32 OR CMAKE_USE_DARWINSSL OR CMAKE_USE_WINSSL OR CMAKE_USE_MBEDTLS)

if(WIN32 OR CMAKE_USE_SECTRANSP OR CMAKE_USE_WINSSL OR CMAKE_USE_MBEDTLS)

  set(openssl_default OFF)

endif()

option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default})



count_true(enabled_ssl_options_count

  CMAKE_USE_WINSSL

  CMAKE_USE_DARWINSSL

  CMAKE_USE_SECTRANSP

  CMAKE_USE_OPENSSL

  CMAKE_USE_MBEDTLS

)
@@ -324,6 +324,10 @@ if(CURL_WINDOWS_SSPI) 
endif()



if(CMAKE_USE_DARWINSSL)

  message(FATAL_ERROR "The cmake option CMAKE_USE_DARWINSSL was renamed to CMAKE_USE_SECTRANSP.")

endif()



if(CMAKE_USE_SECTRANSP)

  find_library(COREFOUNDATION_FRAMEWORK "CoreFoundation")

  if(NOT COREFOUNDATION_FRAMEWORK)

      message(FATAL_ERROR "CoreFoundation framework not found")
@@ -335,7 +339,7 @@ if(CMAKE_USE_DARWINSSL) 
  endif()



  set(SSL_ENABLED ON)

  set(USE_DARWINSSL ON)

  set(USE_SECTRANSP ON)

  list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}")

endif()
@@ -1194,7 +1198,7 @@ _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

if(NOT CURL_DISABLE_CRYPTO_AUTH AND (USE_OPENSSL OR USE_WINDOWS_SSPI OR USE_DARWINSSL OR USE_MBEDTLS))

if(NOT CURL_DISABLE_CRYPTO_AUTH AND (USE_OPENSSL OR USE_WINDOWS_SSPI OR USE_SECTRANSP OR USE_MBEDTLS))

  _add_if("NTLM"        1)

  # TODO missing option (autoconf: --enable-ntlm-wb)

  _add_if("NTLM_WB"     NOT CURL_DISABLE_HTTP AND NTLM_WB_ENABLED)
@@ -1243,7 +1247,7 @@ message(STATUS "Enabled protocols: ${SUPPORT_PROTOCOLS}") 
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("Secure Transport" SSL_ENABLED AND USE_SECTRANSP)

_add_if("mbedTLS"          SSL_ENABLED AND USE_MBEDTLS)

if(_items)

  list(SORT _items)

lib/curl_config.h.cmake

+2 −2
Original line number Diff line number Diff line
@@ -930,8 +930,8 @@ 
/* if PolarSSL is enabled */

#cmakedefine USE_POLARSSL 1



/* if DarwinSSL is enabled */

#cmakedefine USE_DARWINSSL 1

/* if Secure Transport is enabled */

#cmakedefine USE_SECTRANSP 1



/* if mbedTLS is enabled */

#cmakedefine USE_MBEDTLS 1