From 76ec61441ef51911d6ba300c4bc276ca76774c2a Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 23 Mar 2021 18:47:22 +0100 Subject: [PATCH] Fix broken CURL on windows --- deps/CURL/CURL.cmake | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/deps/CURL/CURL.cmake b/deps/CURL/CURL.cmake index 13a6af225..7c322edcf 100644 --- a/deps/CURL/CURL.cmake +++ b/deps/CURL/CURL.cmake @@ -3,17 +3,18 @@ set(_curl_platform_flags -DENABLE_VERSIONED_SYMBOLS:BOOL=ON -DENABLE_THREADED_RESOLVER:BOOL=ON - -DCURL_DISABLE_LDAP:BOOL=ON - -DCURL_DISABLE_LDAPS:BOOL=ON + # -DCURL_DISABLE_LDAP:BOOL=ON + # -DCURL_DISABLE_LDAPS:BOOL=ON -DENABLE_MANUAL:BOOL=OFF - -DCURL_DISABLE_RTSP:BOOL=ON - -DCURL_DISABLE_DICT:BOOL=ON - -DCURL_DISABLE_TELNET:BOOL=ON - -DCURL_DISABLE_POP3:BOOL=ON - -DCURL_DISABLE_IMAP:BOOL=ON - -DCURL_DISABLE_SMB:BOOL=ON - -DCURL_DISABLE_SMTP:BOOL=ON - -DCURL_DISABLE_GOPHER:BOOL=ON + # -DCURL_DISABLE_RTSP:BOOL=ON + # -DCURL_DISABLE_DICT:BOOL=ON + # -DCURL_DISABLE_TELNET:BOOL=ON + # -DCURL_DISABLE_POP3:BOOL=ON + # -DCURL_DISABLE_IMAP:BOOL=ON + # -DCURL_DISABLE_SMB:BOOL=ON + # -DCURL_DISABLE_SMTP:BOOL=ON + # -DCURL_DISABLE_GOPHER:BOOL=ON + -DHTTP_ONLY=ON -DCMAKE_USE_GSSAPI:BOOL=OFF -DCMAKE_USE_LIBSSH2:BOOL=OFF @@ -22,7 +23,9 @@ set(_curl_platform_flags -DUSE_MBEDTLS:BOOL=OFF ) -if (APPLE) +if (WIN32) + set(_curl_platform_flags ${_curl_platform_flags} -DCMAKE_USE_SCHANNEL=ON) +elseif (APPLE) set(_curl_platform_flags ${_curl_platform_flags} @@ -52,8 +55,10 @@ else() endif() prusaslicer_add_cmake_project(CURL - GIT_REPOSITORY https://github.com/curl/curl.git - GIT_TAG curl-7_75_0 + # GIT_REPOSITORY https://github.com/curl/curl.git + # GIT_TAG curl-7_75_0 + URL https://github.com/curl/curl/archive/refs/tags/curl-7_75_0.zip + URL_HASH SHA256=a63ae025bb0a14f119e73250f2c923f4bf89aa93b8d4fafa4a9f5353a96a765a DEPENDS ${ZLIB_PKG} # PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df && # ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch