Browse Source

curl: Set build options the way we need for CMake

Set options added by the update to curl 8.12.0.
Brad King 11 tháng trước cách đây
mục cha
commit
0e1f3f175c
1 tập tin đã thay đổi với 5 bổ sung2 xóa
  1. 5 2
      Utilities/cmcurl/CMakeLists.txt

+ 5 - 2
Utilities/cmcurl/CMakeLists.txt

@@ -22,7 +22,7 @@ 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_BROTLI "OFF" CACHE INTERNAL "Build curl with BROTLI support (AUTO, ON or OFF)")
 set(CURL_DISABLE_ALTSVC ON)
 set(CURL_DISABLE_AWS OFF)
 set(CURL_DISABLE_BASIC_AUTH OFF)
@@ -76,7 +76,7 @@ set(CURL_LTO OFF CACHE INTERNAL "Turn on compiler Link Time Optimizations")
 set(CURL_STATIC_CRT OFF CACHE INTERNAL "Set to ON to build libcurl with static CRT on Windows (/MT).")
 set(CURL_WERROR OFF CACHE INTERNAL "Turn compiler warnings into errors")
 set(CURL_ZLIB "AUTO" CACHE INTERNAL "Build curl with ZLIB support (AUTO, ON or OFF)")
-set(CURL_ZSTD OFF)
+set(CURL_ZSTD "OFF" CACHE INTERNAL "Build curl with ZSTD support (AUTO, ON or OFF)")
 set(DISABLED_THREADSAFE OFF CACHE INTERNAL "Curl can use thread-safe functions")
 set(ENABLE_ARES OFF CACHE INTERNAL "No curl c-ares support")
 set(ENABLE_ALT_SVC OFF)
@@ -108,6 +108,7 @@ set(USE_NGHTTP2 ON)
 set(USE_NGTCP2 OFF)
 set(USE_OPENSSL_QUIC OFF)
 set(USE_QUICHE OFF)
+set(USE_SSLS_EXPORT OFF)
 set(USE_WIN32_IDN OFF)
 set(USE_WIN32_LDAP OFF CACHE INTERNAL "No curl Windows LDAP")
 if(CURL_USE_OPENSSL)
@@ -991,9 +992,11 @@ if(CURL_USE_OPENSSL)
     set(_openssl "AmiSSL")
   else()
     set(_openssl "OpenSSL")
+    if(0) # XXX(cmake): not needed for build within cmake
     if(OPENSSL_VERSION VERSION_LESS 1.1.1)
       message(WARNING "OpenSSL ${OPENSSL_VERSION} does not support TLS 1.3.")
     endif()
+    endif() # XXX(cmake): end
   endif()
 endif()