From 1392cf056caf3d26d464d5a6fd82df69eaec941a Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 31 Oct 2023 21:11:10 +0100 Subject: [PATCH] Fix schannel support on Windows --- appveyor.yml | 2 +- cmake/Hunter/config.cmake | 42 +++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4f0db94b..5e59117a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ environment: cache: - - c:\hunter\ -> appveyor.yml, CMakeLists.txt + - c:\hunter\ -> appveyor.yml, CMakeLists.txt, cmake/Hunter/config.cmake - build\_deps -> appveyor.yml, CMakeLists.txt build: diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index d735a69d..3d5dd00f 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -9,11 +9,26 @@ if (WIN32) CURL VERSION 8.4.0-p0 CMAKE_ARGS - CMAKE_USE_SCHANNEL=ON BUILD_CURL_TESTS=OFF BUILD_CURL_EXE=OFF - CMAKE_USE_OPENSSL=OFF - CMAKE_USE_LIBSSH2=OFF + CURL_USE_SCHANNEL=ON + CURL_USE_OPENSSL=OFF + CURL_USE_LIBSSH2=OFF + CURL_DISABLE_FTP=ON + CURL_DISABLE_FTP=ON + CURL_DISABLE_FILE=ON + CURL_DISABLE_TELNET=ON + CURL_DISABLE_LDAP=ON + CURL_DISABLE_DICT=ON + CURL_DISABLE_TFTP=ON + CURL_DISABLE_GOPHER=ON + CURL_DISABLE_POP3=ON + CURL_DISABLE_IMAP=ON + CURL_DISABLE_SMB=ON + CURL_DISABLE_SMTP=ON + CURL_DISABLE_RTSP=ON + CURL_USE_LIBRTMP=OFF + CURL_DISABLE_MQTT=ON BUILD_TESTING=OFF ) else() @@ -21,11 +36,26 @@ else() CURL VERSION 8.4.0-p0 CMAKE_ARGS - CMAKE_USE_SCHANNEL=OFF BUILD_CURL_TESTS=OFF BUILD_CURL_EXE=OFF - CMAKE_USE_OPENSSL=ON - CMAKE_USE_LIBSSH2=OFF + CURL_USE_SCHANNEL=OFF + CURL_USE_OPENSSL=ON + CURL_USE_LIBSSH2=OFF + CURL_DISABLE_FTP=ON + CURL_DISABLE_FTP=ON + CURL_DISABLE_FILE=ON + CURL_DISABLE_TELNET=ON + CURL_DISABLE_LDAP=ON + CURL_DISABLE_DICT=ON + CURL_DISABLE_TFTP=ON + CURL_DISABLE_GOPHER=ON + CURL_DISABLE_POP3=ON + CURL_DISABLE_IMAP=ON + CURL_DISABLE_SMB=ON + CURL_DISABLE_SMTP=ON + CURL_DISABLE_RTSP=ON + CURL_USE_LIBRTMP=OFF + CURL_DISABLE_MQTT=ON BUILD_TESTING=OFF ) endif()