From da52e4e5712116a17c574efcb677fcd95db1bb56 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 18 Sep 2024 11:51:40 -0400 Subject: [PATCH] curl: Set build options the way we need for CMake Set options added by the update to curl 8.10.1. --- Utilities/cmcurl/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 8000b91786..ef6c269e89 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -11,12 +11,15 @@ set(CURL_USE_GSSAPI OFF) set(CURL_USE_LIBPSL OFF) set(CURL_USE_LIBSSH2 OFF) set(CURL_USE_LIBSSH OFF) +set(CURL_USE_LIBUV OFF) set(CURL_USE_MBEDTLS OFF) set(CURL_USE_NSS OFF) set(CURL_USE_OPENLDAP OFF) set(CURL_USE_OPENSSL "${CMAKE_USE_OPENSSL}") +set(CURL_USE_PKGCONFIG OFF) set(CURL_USE_SCHANNEL OFF) set(CURL_USE_SECTRANSP OFF) +set(CURL_USE_WOLFSSH OFF) set(CURL_USE_WOLFSSL OFF) set(CURL_BROTLI OFF) set(CURL_DISABLE_ALTSVC ON) @@ -54,6 +57,7 @@ set(CURL_DISABLE_POP3 ON CACHE INTERNAL "Disable curl pop3 protocol?") set(CURL_DISABLE_PROGRESS_METER OFF) set(CURL_DISABLE_PROXY OFF CACHE INTERNAL "Do not disable curl proxy") set(CURL_DISABLE_RTSP ON CACHE INTERNAL "Disable curl rtsp protocol?") +set(CURL_DISABLE_SHA512_256 OFF) set(CURL_DISABLE_SHUFFLE_DNS OFF) set(CURL_DISABLE_SMB OFF) set(CURL_DISABLE_SMTP ON CACHE INTERNAL "Disable curl smtp protocol?") @@ -741,7 +745,9 @@ if(CURL_USE_SECTRANSP) set(_valid_default_ssl_backend TRUE) endif() + if(0) # This code not needed for building within CMake. message(WARNING "Secure Transport does not support TLS 1.3.") + endif() endif() if(_use_core_foundation_and_core_services) @@ -823,7 +829,9 @@ if(CURL_USE_BEARSSL) endif() set(_curl_ca_bundle_supported TRUE) + if(0) # This code not needed for building within CMake. message(WARNING "BearSSL does not support TLS 1.3.") + endif() endif() if(CURL_USE_WOLFSSL) @@ -1265,7 +1273,7 @@ option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) set(HAVE_IDN2_H OFF) set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN) - find_package(Libidn2) + find_package(Libidn2 QUIET) if(LIBIDN2_FOUND) set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}") list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})