@@ -5,12 +5,16 @@ if (NOT CURL_EXT_EXTRA_OPTIONS)
55endif ()
66
77if (APPLE )
8- list (APPEND CURL_EXT_EXTRA_OPTIONS "-DCURL_USE_SECTRANSP=ON" )
9- else ()
10- find_package (OpenSSL REQUIRED COMPONENTS SSL Crypto )
11- if (DEFINED OPENSSL_ROOT_DIR)
12- list (APPEND CURL_EXT_EXTRA_OPTIONS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} " )
13- endif ()
8+ list (APPEND CURL_EXT_EXTRA_OPTIONS
9+ "-DCURL_USE_OPENSSL=ON"
10+ "-DUSE_APPLE_SECTRUST=ON"
11+ "-DCURL_CA_BUNDLE=none"
12+ "-DCURL_CA_PATH=none" )
13+ endif ()
14+
15+ find_package (OpenSSL REQUIRED COMPONENTS SSL Crypto )
16+ if (DEFINED OPENSSL_ROOT_DIR)
17+ list (APPEND CURL_EXT_EXTRA_OPTIONS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} " )
1418endif ()
1519if (DEFINED CMAKE_TOOLCHAIN_FILE )
1620 list (APPEND CURL_EXT_EXTRA_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE } " )
@@ -19,7 +23,7 @@ endif()
1923if (OWN_CURL_SOURCE_DIR )
2024 set (CURL_EXT_PROPERTIES SOURCE_DIR ${OWN_CURL_SOURCE_DIR } )
2125else ()
22- set (CURL_EXT_PROPERTIES URL "http ://curl.haxx. se/download/curl-8.0.1 .tar.gz" )
26+ set (CURL_EXT_PROPERTIES URL "https ://curl.se/download/curl-8.21.0 .tar.gz" )
2327endif ()
2428
2529# -DCMAKE_INSTALL_LIBDIR=lib is required to find libcurl.a on fedora, default is lib64
@@ -36,7 +40,7 @@ add_dependencies(curl curl_ext)
3640set_property (TARGET curl PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR } /ext/curl/lib/libcurl.a)
3741set_property (TARGET curl PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR } /ext/curl/include/)
3842if (APPLE )
39- set_property (TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES "-framework SystemConfiguration -framework Security -framework CoreFoundation" )
43+ set_property (TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES "OpenSSL::SSL;OpenSSL::Crypto; -framework SystemConfiguration; -framework Security; -framework CoreFoundation" )
4044else ()
4145 set_property (TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
4246endif ()
0 commit comments