From fe2fe52c86105b9a22f14fd2c9605b6de3284c49 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 11 Dec 2023 20:38:26 -0500 Subject: curl: Set build options the way we need for CMake Set options added by the update to curl 8.5.0. --- Utilities/cmcurl/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 071285d..e6c4f1b 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -22,6 +22,7 @@ set(CURL_DISABLE_ALTSVC ON) set(CURL_DISABLE_AWS OFF) set(CURL_DISABLE_BASIC_AUTH OFF) set(CURL_DISABLE_BEARER_AUTH OFF) +set(CURL_DISABLE_BINDLOCAL OFF) set(CURL_DISABLE_COOKIES OFF CACHE INTERNAL "Do not disable curl cookie support") set(CURL_DISABLE_DICT ON CACHE INTERNAL "Disable curl dict protocol?") set(CURL_DISABLE_DIGEST_AUTH OFF) @@ -31,10 +32,12 @@ set(CURL_DISABLE_FORM_API OFF) set(CURL_DISABLE_FTP OFF CACHE INTERNAL "Disable curl ftp protocol?") set(CURL_DISABLE_GETOPTIONS OFF) set(CURL_DISABLE_GOPHER ON CACHE INTERNAL "Disable curl gopher protocol?") +set(CURL_DISABLE_HEADERS_API OFF) set(CURL_DISABLE_HSTS OFF) set(CURL_DISABLE_HTTP_AUTH OFF) set(CURL_DISABLE_HTTP OFF CACHE INTERNAL "Disable curl http protocol?") set(CURL_DISABLE_IMAP ON CACHE INTERNAL "Disable curl imap protocol?") +set(CURL_DISABLE_INSTALL ON) set(CURL_DISABLE_KERBEROS_AUTH OFF) set(CURL_DISABLE_LDAP ON CACHE INTERNAL "Disable curl ldap protocol?") set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "Disable curl ldaps protocol?") @@ -1254,9 +1257,9 @@ if(WIN32) check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H) check_include_file_concat("windows.h" HAVE_WINDOWS_H) else() - set(HAVE_WINDOWS_H 0) - set(HAVE_WS2TCPIP_H 0) set(HAVE_WINSOCK2_H 0) + set(HAVE_WS2TCPIP_H 0) + set(HAVE_WINDOWS_H 0) endif() if(WIN32) -- cgit v0.12