etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-04-09 07:52:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated curl to 7.86.0

Browse source
This commit is contained in:
Jacker 2022-11-08 12:38:57 +02:00
parent fe42d88871
commit 00d0460f84
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
CMakeLists.txt
View file

@ -320,16 +320,23 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
if(BUNDLED_WOLFSSL)
include(CheckTypeSize)
check_type_size("long long" SIZEOF_LONG_LONG)
get_target_property(WOLFSSL_INCLUDE_DIRECTORIES bundled_wolfssl_int INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(WOLFSSL_LIBRARIES bundled_wolfssl_int INTERFACE_LINK_LIBRARIES)
list(GET WOLFSSL_INCLUDE_DIRECTORIES 0 WOLFSSL_INCLUDE_DIR)
list(GET WOLFSSL_LIBRARIES 0 WOLFSSL_LIBRARY)
list(APPEND CURL_CMAKE_ARGS
-DCMAKE_C_FLAGS=-DSIZEOF_LONG_LONG=${SIZEOF_LONG_LONG}
-DCMAKE_USE_OPENSSL=OFF -DCURL_DISABLE_CRYPTO_AUTH=ON
-DCMAKE_USE_WOLFSSL=ON
-DCMAKE_LIBRARY_PATH=${LIBS_BINARY_DIR}/wolfssl
-DWolfSSL_INCLUDE_DIR=${WOLFSSL_BUNDLED_INCLUDE_DIR}
-DCURL_USE_OPENSSL=OFF -DCURL_DISABLE_CRYPTO_AUTH=ON
-DCURL_USE_WOLFSSL=ON
-DCMAKE_LIBRARY_PATH=${LIBS_BINARY_DIR}/wolfssl/lib
-DCMAKE_INCLUDE_PATH=${LIBS_BINARY_DIR}/wolfssl/include
#-DWolfSSL_INCLUDE_DIR=${WOLFSSL_INCLUDE_DIR}
#-DWolfSSL_LIBRARY=${WOLFSSL_LIBRARY}
)
elseif(BUNDLED_OPENSSL)
list(APPEND CURL_CMAKE_ARGS -DOPENSSL_ROOT_DIR=${OPENSSL_PREFIX} -DCMAKE_USE_OPENSSL=ON)
list(APPEND CURL_CMAKE_ARGS -DOPENSSL_ROOT_DIR=${OPENSSL_PREFIX} -DCURL_USE_OPENSSL=ON)
else()
list(APPEND CURL_CMAKE_ARGS -DCMAKE_USE_OPENSSL=OFF -DCMAKE_USE_SCHANNEL=ON)
endif()
@ -343,10 +350,9 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
ExternalProject_Add(bundled_curl
DEPENDS bundled_wolfssl bundled_openssl
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}
URL https://github.com/curl/curl/archive/curl-7_80_0.tar.gz
URL_HASH MD5=d96c3324dd060474508312449105d835
URL https://github.com/curl/curl/archive/curl-7_86_0.tar.gz
URL_HASH MD5=fdbf8d543998fb0d6aa1e7afdf8ad4e1
SOURCE_DIR "${LIBS_DOWNLOAD_SRC_DIR}/curl"
# SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/curl
PREFIX ${LIBS_BINARY_DIR}/curl
BINARY_DIR ${binary_dir}
BUILD_BYPRODUCTS ${_CURL_OUTPUT}