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

tidy-up: dedupe Windows system libs in cmake

Browse Source 
Reviewed-by: Daniel Stenberg
Closes #12307
This commit is contained in:
Viktor Szakats 2023-11-11 18:38:02 +00:00
parent a621418995
commit ff1fdfecb1
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -390,7 +390,7 @@ endif()
check_function_exists(gethostname HAVE_GETHOSTNAME) check_function_exists(gethostname HAVE_GETHOSTNAME)
if(WIN32) if(WIN32)
list(APPEND CURL_LIBS "ws2_32") list(APPEND CURL_LIBS "ws2_32" "bcrypt")
if(USE_LIBRTMP) if(USE_LIBRTMP)
list(APPEND CURL_LIBS "winmm") list(APPEND CURL_LIBS "winmm")
endif() endif()
@ -494,11 +494,6 @@ if(CURL_USE_OPENSSL)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
endif() endif()
if(WIN32)
list(APPEND CURL_LIBS "ws2_32")
list(APPEND CURL_LIBS "bcrypt") # for OpenSSL/LibreSSL
endif()
if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "openssl") if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "openssl")
set(valid_default_ssl_backend TRUE) set(valid_default_ssl_backend TRUE)
endif() endif()
@ -1437,8 +1432,6 @@ if(WIN32)
if(USE_WIN32_CRYPTO OR USE_SCHANNEL) if(USE_WIN32_CRYPTO OR USE_SCHANNEL)
list(APPEND CURL_LIBS "advapi32" "crypt32") list(APPEND CURL_LIBS "advapi32" "crypt32")
endif() endif()
list(APPEND CURL_LIBS "bcrypt")
endif() endif()
if(MSVC) if(MSVC)