This commit is contained in:
Jacker 2022-11-08 12:40:34 +02:00
parent 00d0460f84
commit 71d9884a89

View file

@ -320,11 +320,6 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
if(BUNDLED_WOLFSSL) if(BUNDLED_WOLFSSL)
include(CheckTypeSize) include(CheckTypeSize)
check_type_size("long long" SIZEOF_LONG_LONG) 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 list(APPEND CURL_CMAKE_ARGS
-DCMAKE_C_FLAGS=-DSIZEOF_LONG_LONG=${SIZEOF_LONG_LONG} -DCMAKE_C_FLAGS=-DSIZEOF_LONG_LONG=${SIZEOF_LONG_LONG}
@ -332,8 +327,6 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
-DCURL_USE_WOLFSSL=ON -DCURL_USE_WOLFSSL=ON
-DCMAKE_LIBRARY_PATH=${LIBS_BINARY_DIR}/wolfssl/lib -DCMAKE_LIBRARY_PATH=${LIBS_BINARY_DIR}/wolfssl/lib
-DCMAKE_INCLUDE_PATH=${LIBS_BINARY_DIR}/wolfssl/include -DCMAKE_INCLUDE_PATH=${LIBS_BINARY_DIR}/wolfssl/include
#-DWolfSSL_INCLUDE_DIR=${WOLFSSL_INCLUDE_DIR}
#-DWolfSSL_LIBRARY=${WOLFSSL_LIBRARY}
) )
elseif(BUNDLED_OPENSSL) elseif(BUNDLED_OPENSSL)
list(APPEND CURL_CMAKE_ARGS -DOPENSSL_ROOT_DIR=${OPENSSL_PREFIX} -DCURL_USE_OPENSSL=ON) list(APPEND CURL_CMAKE_ARGS -DOPENSSL_ROOT_DIR=${OPENSSL_PREFIX} -DCURL_USE_OPENSSL=ON)