diff --git a/3rdParty/curl/CMakeLists.txt b/3rdParty/curl/CMakeLists.txt index f4f8c83..f3966da 100644 --- a/3rdParty/curl/CMakeLists.txt +++ b/3rdParty/curl/CMakeLists.txt @@ -1,8 +1,8 @@ include(../../cmake/Utils.cmake) set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl) -find_package(curl QUIET) -if (NOT DEFINED curl_FOUND) +find_package(CURL QUIET) +if (NOT DEFINED CURL_FOUND) file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL}) execute_process( COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext @@ -23,9 +23,9 @@ else () endif () function(LinkCurl TARGET BINARY_DIR) - find_package(curl QUIET) - set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl) - if (NOT DEFINED curl_FOUND) + find_package(CURL QUIET) + if (NOT DEFINED CURL_FOUND) + set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl) target_include_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/include) target_link_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/lib) if (MSVC) @@ -34,7 +34,7 @@ function(LinkCurl TARGET BINARY_DIR) target_link_libraries(${TARGET} PRIVATE crypto ssl curl) endif () else () - target_include_directories(${TARGET} PRIVATE ${curl_INCLUDE_DIR}) - target_link_libraries(${TARGET} PRIVATE ${curl_LIBRARIES}) + target_include_directories(${TARGET} PRIVATE ${CURL_INCLUDE_DIR}) + target_link_libraries(${TARGET} PRIVATE CURL::libcurl) endif () endfunction() \ No newline at end of file diff --git a/3rdParty/curl/ext/CMakeLists.txt b/3rdParty/curl/ext/CMakeLists.txt index ab45053..8030a58 100644 --- a/3rdParty/curl/ext/CMakeLists.txt +++ b/3rdParty/curl/ext/CMakeLists.txt @@ -17,7 +17,7 @@ if (MSVC) set(OPENSSL_PERL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/src/openssl/Configure VC-WIN64A) set(OPENSSL_MAKE_COMMAND nmake) else () - set(OPENSSL_PERL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/src/openssl/config) + set(OPENSSL_PERL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/src/OpenSSL/config --static -static -fPIC) set(OPENSSL_MAKE_COMMAND make) endif ()