Skip to content

Commit

Permalink
Update curl and fixes (#810)
Browse files Browse the repository at this point in the history
* Use CURL_USE_SECTRANSP on macOS
  • Loading branch information
ChristopherHX committed Mar 24, 2023
1 parent 795e4d8 commit b7c22ba
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions ext/curl.cmake
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
include(ExternalProject)

if (NOT APPLE)
find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
endif()

if (NOT CURL_EXT_EXTRA_OPTIONS)
set(CURL_EXT_EXTRA_OPTIONS )
endif()

if (DEFINED OPENSSL_ROOT_DIR)
list(APPEND CURL_EXT_EXTRA_OPTIONS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}")
if (APPLE)
list(APPEND CURL_EXT_EXTRA_OPTIONS "-DCURL_USE_SECTRANSP=ON")
else()
find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
if (DEFINED OPENSSL_ROOT_DIR)
list(APPEND CURL_EXT_EXTRA_OPTIONS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}")
endif()
endif()

ExternalProject_Add(
curl_ext
URL "http://curl.haxx.se/download/curl-7.87.0.tar.gz"
URL "http://curl.haxx.se/download/curl-8.0.1.tar.gz"
INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/curl
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCMAKE_USE_LIBSSH2=OFF" "-DCMAKE_USE_OPENLDAP=OFF" "-DUSE_LIBIDN2=OFF" "-DENABLE_WEBSOCKETS=ON" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_LINK_FLAGS=${CMAKE_LINK_FLAGS}" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS}
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCURL_USE_LIBSSH2=OFF" "-DCURL_USE_OPENLDAP=OFF" "-DUSE_LIBIDN2=OFF" "-DENABLE_WEBSOCKETS=ON" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_LINK_FLAGS=${CMAKE_LINK_FLAGS}" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS}
)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/ext/curl/include/)
add_library(curl STATIC IMPORTED)
add_dependencies(curl curl_ext)
set_property(TARGET curl PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/ext/curl/lib/libcurl.a)
set_property(TARGET curl PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/ext/curl/include/)
if (NOT APPLE)
if (APPLE)
set_property(TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES "-framework SystemConfiguration -framework Security -framework CoreFoundation")
else()
set_property(TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
endif()

Expand Down

0 comments on commit b7c22ba

Please sign in to comment.