Skip to content

Commit d69e9f0

Browse files
macOS use openssl + APPLE_SECTRUST
1 parent c535dc1 commit d69e9f0

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

ext/curl.cmake

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ if (NOT CURL_EXT_EXTRA_OPTIONS)
55
endif()
66

77
if (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}")
1418
endif()
1519
if (DEFINED CMAKE_TOOLCHAIN_FILE)
1620
list(APPEND CURL_EXT_EXTRA_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
@@ -19,7 +23,7 @@ endif()
1923
if(OWN_CURL_SOURCE_DIR)
2024
set(CURL_EXT_PROPERTIES SOURCE_DIR ${OWN_CURL_SOURCE_DIR})
2125
else()
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")
2327
endif()
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)
3640
set_property(TARGET curl PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/ext/curl/lib/libcurl.a)
3741
set_property(TARGET curl PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/ext/curl/include/)
3842
if (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")
4044
else()
4145
set_property(TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
4246
endif()

0 commit comments

Comments
 (0)