curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-18 10:02:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: private identifiers use CURL_ instead of CMAKE_ prefix

Browse Source 
Since the 'CMAKE_' prefix is reserved for cmake's own private use.
Ref: https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html

Reported-by: Boris Rasin
Fixes #7988
Closes #8044
This commit is contained in:
Daniel Stenberg 2021-11-22 17:39:46 +01:00
parent 3e6eb18fce
commit 9108da2c26
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View File

@ -115,7 +115,7 @@ jobs:
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
- name: libssh2 - name: libssh2
install: nghttp2 openssl libssh2 install: nghttp2 openssl libssh2
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_USE_LIBSSH2=ON generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_USE_LIBSSH2=ON
steps: steps:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle' name: 'brew bundle'

84
CMakeLists.txt
View File

@ -355,58 +355,54 @@ endif()
# check SSL libraries # check SSL libraries
# TODO support GnuTLS # TODO support GnuTLS
option(CURL_ENABLE_SSL "Enable SSL support" ON) option(CURL_ENABLE_SSL "Enable SSL support" ON)
if(CMAKE_USE_WINSSL) if(CURL_USE_SCHANNEL)
message(FATAL_ERROR "The cmake option CMAKE_USE_WINSSL was renamed to CMAKE_USE_SCHANNEL.") message(FATAL_ERROR "The cmake option CURL_USE_SCHANNEL was renamed to CURL_USE_SCHANNEL.")
endif() endif()
if(APPLE) if(APPLE)
cmake_dependent_option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF)
endif() endif()
if(WIN32) if(WIN32)
cmake_dependent_option(CMAKE_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without openssl" ON cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without openssl" ON
CMAKE_USE_SCHANNEL OFF) CURL_USE_SCHANNEL OFF)
endif() endif()
cmake_dependent_option(CMAKE_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CMAKE_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CMAKE_USE_NSS "Enable NSS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_NSS "Enable NSS for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
cmake_dependent_option(CMAKE_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF)
set(openssl_default ON) set(openssl_default ON)
if(WIN32 OR CMAKE_USE_SECTRANSP OR CMAKE_USE_SCHANNEL OR CMAKE_USE_MBEDTLS OR CMAKE_USE_NSS OR CMAKE_USE_WOLFSSL) if(WIN32 OR CURL_USE_SECTRANSP OR CURL_USE_SCHANNEL OR CURL_USE_MBEDTLS OR CURL_USE_NSS OR CURL_USE_WOLFSSL)
set(openssl_default OFF) set(openssl_default OFF)
endif() endif()
cmake_dependent_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default} CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default} CURL_ENABLE_SSL OFF)
option(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG "Disable automatic loading of OpenSSL configuration" OFF) option(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG "Disable automatic loading of OpenSSL configuration" OFF)
count_true(enabled_ssl_options_count count_true(enabled_ssl_options_count
CMAKE_USE_SCHANNEL CURL_USE_SCHANNEL
CMAKE_USE_SECTRANSP CURL_USE_SECTRANSP
CMAKE_USE_OPENSSL CURL_USE_OPENSSL
CMAKE_USE_MBEDTLS CURL_USE_MBEDTLS
CMAKE_USE_BEARSSL CURL_USE_BEARSSL
CMAKE_USE_NSS CURL_USE_NSS
CMAKE_USE_WOLFSSL CURL_USE_WOLFSSL
) )
if(enabled_ssl_options_count GREATER "1") if(enabled_ssl_options_count GREATER "1")
set(CURL_WITH_MULTI_SSL ON) set(CURL_WITH_MULTI_SSL ON)
endif() endif()
if(CMAKE_USE_SCHANNEL) if(CURL_USE_SCHANNEL)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_SCHANNEL ON) # Windows native SSL/TLS support set(USE_SCHANNEL ON) # Windows native SSL/TLS support
set(USE_WINDOWS_SSPI ON) # CMAKE_USE_SCHANNEL implies CURL_WINDOWS_SSPI set(USE_WINDOWS_SSPI ON) # CURL_USE_SCHANNEL implies CURL_WINDOWS_SSPI
endif() endif()
if(CURL_WINDOWS_SSPI) if(CURL_WINDOWS_SSPI)
set(USE_WINDOWS_SSPI ON) set(USE_WINDOWS_SSPI ON)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DSECURITY_WIN32") set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DSECURITY_WIN32")
endif() endif()
if(CMAKE_USE_DARWINSSL) if(CURL_USE_SECTRANSP)
message(FATAL_ERROR "The cmake option CMAKE_USE_DARWINSSL was renamed to CMAKE_USE_SECTRANSP.")
endif()
if(CMAKE_USE_SECTRANSP)
set(use_core_foundation ON) set(use_core_foundation ON)
find_library(SECURITY_FRAMEWORK "Security") find_library(SECURITY_FRAMEWORK "Security")
@ -428,7 +424,7 @@ if(use_core_foundation)
list(APPEND CURL_LIBS "-framework CoreFoundation") list(APPEND CURL_LIBS "-framework CoreFoundation")
endif() endif()
if(CMAKE_USE_OPENSSL) if(CURL_USE_OPENSSL)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_OPENSSL ON) set(USE_OPENSSL ON)
@ -458,7 +454,7 @@ if(CMAKE_USE_OPENSSL)
add_definitions(-DOPENSSL_SUPPRESS_DEPRECATED) add_definitions(-DOPENSSL_SUPPRESS_DEPRECATED)
endif() endif()
if(CMAKE_USE_MBEDTLS) if(CURL_USE_MBEDTLS)
find_package(MbedTLS REQUIRED) find_package(MbedTLS REQUIRED)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_MBEDTLS ON) set(USE_MBEDTLS ON)
@ -466,7 +462,7 @@ if(CMAKE_USE_MBEDTLS)
include_directories(${MBEDTLS_INCLUDE_DIRS}) include_directories(${MBEDTLS_INCLUDE_DIRS})
endif() endif()
if(CMAKE_USE_BEARSSL) if(CURL_USE_BEARSSL)
find_package(BearSSL REQUIRED) find_package(BearSSL REQUIRED)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_BEARSSL ON) set(USE_BEARSSL ON)
@ -474,7 +470,7 @@ if(CMAKE_USE_BEARSSL)
include_directories(${BEARSSL_INCLUDE_DIRS}) include_directories(${BEARSSL_INCLUDE_DIRS})
endif() endif()
if(CMAKE_USE_WOLFSSL) if(CURL_USE_WOLFSSL)
find_package(WolfSSL REQUIRED) find_package(WolfSSL REQUIRED)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_WOLFSSL ON) set(USE_WOLFSSL ON)
@ -482,7 +478,7 @@ if(CMAKE_USE_WOLFSSL)
include_directories(${WolfSSL_INCLUDE_DIRS}) include_directories(${WolfSSL_INCLUDE_DIRS})
endif() endif()
if(CMAKE_USE_NSS) if(CURL_USE_NSS)
find_package(NSS REQUIRED) find_package(NSS REQUIRED)
include_directories(${NSS_INCLUDE_DIRS}) include_directories(${NSS_INCLUDE_DIRS})
list(APPEND CURL_LIBS ${NSS_LIBRARIES}) list(APPEND CURL_LIBS ${NSS_LIBRARIES})
@ -563,13 +559,13 @@ if(NOT CURL_DISABLE_LDAP)
endif() endif()
endif() endif()
option(CMAKE_USE_OPENLDAP "Use OpenLDAP code." OFF) option(CURL_USE_OPENLDAP "Use OpenLDAP code." OFF)
mark_as_advanced(CMAKE_USE_OPENLDAP) mark_as_advanced(CURL_USE_OPENLDAP)
set(CMAKE_LDAP_LIB "ldap" CACHE STRING "Name or full path to ldap library") set(CMAKE_LDAP_LIB "ldap" CACHE STRING "Name or full path to ldap library")
set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library") set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library")
if(CMAKE_USE_OPENLDAP AND USE_WIN32_LDAP) if(CURL_USE_OPENLDAP AND USE_WIN32_LDAP)
message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CMAKE_USE_OPENLDAP at the same time") message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CURL_USE_OPENLDAP at the same time")
endif() endif()
# Now that we know, we're not using windows LDAP... # Now that we know, we're not using windows LDAP...
@ -599,7 +595,7 @@ if(NOT CURL_DISABLE_LDAP)
set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_BAK}) #LDAP includes won't be used set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_BAK}) #LDAP includes won't be used
else() else()
if(CMAKE_USE_OPENLDAP) if(CURL_USE_OPENLDAP)
set(USE_OPENLDAP ON) set(USE_OPENLDAP ON)
endif() endif()
if(CMAKE_LDAP_INCLUDE_DIR) if(CMAKE_LDAP_INCLUDE_DIR)
@ -729,13 +725,13 @@ if(CURL_ZSTD)
endif() endif()
#libSSH2 #libSSH2
option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON) option(CURL_USE_LIBSSH2 "Use libSSH2" ON)
mark_as_advanced(CMAKE_USE_LIBSSH2) mark_as_advanced(CURL_USE_LIBSSH2)
set(USE_LIBSSH2 OFF) set(USE_LIBSSH2 OFF)
set(HAVE_LIBSSH2 OFF) set(HAVE_LIBSSH2 OFF)
set(HAVE_LIBSSH2_H OFF) set(HAVE_LIBSSH2_H OFF)
if(CMAKE_USE_LIBSSH2) if(CURL_USE_LIBSSH2)
find_package(LibSSH2) find_package(LibSSH2)
if(LIBSSH2_FOUND) if(LIBSSH2_FOUND)
list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY}) list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY})
@ -754,9 +750,9 @@ if(CMAKE_USE_LIBSSH2)
endif() endif()
# libssh # libssh
option(CMAKE_USE_LIBSSH "Use libSSH" OFF) option(CURL_USE_LIBSSH "Use libSSH" OFF)
mark_as_advanced(CMAKE_USE_LIBSSH) mark_as_advanced(CURL_USE_LIBSSH)
if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH) if(NOT HAVE_LIBSSH2 AND CURL_USE_LIBSSH)
find_package(libssh CONFIG) find_package(libssh CONFIG)
if(libssh_FOUND) if(libssh_FOUND)
message(STATUS "Found libssh ${libssh_VERSION}") message(STATUS "Found libssh ${libssh_VERSION}")
@ -767,10 +763,10 @@ if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH)
endif() endif()
endif() endif()
option(CMAKE_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF) option(CURL_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF)
mark_as_advanced(CMAKE_USE_GSSAPI) mark_as_advanced(CURL_USE_GSSAPI)
if(CMAKE_USE_GSSAPI) if(CURL_USE_GSSAPI)
find_package(GSS) find_package(GSS)
set(HAVE_GSSAPI ${GSS_FOUND}) set(HAVE_GSSAPI ${GSS_FOUND})

4
appveyor.yml
View File

@ -254,8 +254,8 @@ build_script:
cmake . cmake .
-G"%PRJ_GEN%" -G"%PRJ_GEN%"
%TARGET% %TARGET%
-DCMAKE_USE_OPENSSL=%OPENSSL% -DCURL_USE_OPENSSL=%OPENSSL%
-DCMAKE_USE_SCHANNEL=%SCHANNEL% -DCURL_USE_SCHANNEL=%SCHANNEL%
-DHTTP_ONLY=%HTTP_ONLY% -DHTTP_ONLY=%HTTP_ONLY%
-DBUILD_SHARED_LIBS=%SHARED% -DBUILD_SHARED_LIBS=%SHARED%
-DBUILD_TESTING=%TESTING% -DBUILD_TESTING=%TESTING%