luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Remove deprecated symbols check

Browse Source 
curl stopped use of CMAKE_USE_ as a prefix for its own build symbols in
2021 and added a check, meant to last 1 year, to fatally error on those
symbols. This commit removes that check.

Closes https://github.com/curl/curl/pull/10314
This commit is contained in:
xgladius 2023-01-17 12:08:10 -06:00 committed by Jay Satiro
parent 5a70403cff
commit ac6e7f5689
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -358,24 +358,6 @@ if(WIN32)
check_library_exists_concat("winmm" getch HAVE_LIBWINMM) check_library_exists_concat("winmm" getch HAVE_LIBWINMM)
endif() endif()
# This check below for use of deprecated symbols is only temporary and is to
# be removed again after a year's service. Remove after November 25, 2022.
set(CURL_RECONFIG_REQUIRED 0)
foreach(_LIB GSSAPI OPENLDAP LIBSSH LIBSSH2 BEARSSL MBEDTLS NSS OPENSSL
SCHANNEL SECTRANSP WOLFSSL)
if(CMAKE_USE_${_LIB})
set(CURL_RECONFIG_REQUIRED 1)
message(SEND_ERROR "The option CMAKE_USE_${_LIB} was renamed to CURL_USE_${_LIB}.")
endif()
endforeach()
if(CMAKE_USE_WINSSL)
set(CURL_RECONFIG_REQUIRED 1)
message(SEND_ERROR "The option CMAKE_USE_WINSSL was renamed to CURL_USE_SCHANNEL.")
endif()
if(CURL_RECONFIG_REQUIRED)
message(FATAL_ERROR "Reconfig required")
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)