diff --git a/3rdParty/curl/CMakeLists.txt b/3rdParty/curl/CMakeLists.txt index 0c9367d..e2ce302 100644 --- a/3rdParty/curl/CMakeLists.txt +++ b/3rdParty/curl/CMakeLists.txt @@ -1,8 +1,7 @@ include(../../cmake/Utils.cmake) set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl) -# find_package(CURL QUIET) -set(CURL_FOUND 0) +find_package(CURL QUIET) if (NOT ${CURL_FOUND}) file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL}) if (WIN32) @@ -29,8 +28,7 @@ else () endif () function(LinkCurl TARGET) - #find_package(CURL QUIET) - set(CURL_FOUND 0) + find_package(CURL QUIET) if (NOT ${CURL_FOUND}) if (NOT WIN32) target_link_libraries(${TARGET} PRIVATE curl) diff --git a/3rdParty/curl/ext_windows/CMakeLists.txt b/3rdParty/curl/ext_windows/CMakeLists.txt index 3d3efde..09a7e0b 100644 --- a/3rdParty/curl/ext_windows/CMakeLists.txt +++ b/3rdParty/curl/ext_windows/CMakeLists.txt @@ -16,6 +16,11 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(libressl) +set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries" FORCE) +set(BUILD_STATIC_LIBS ON CACHE BOOL "Build static libraries" FORCE) +set(BUILD_STATIC_CURL ON CACHE BOOL "Build curl executable with static libcurl" FORCE) +set(CURL_DISABLE_TESTS ON CACHE BOOL "Do no build tests" FORCE) + set(CURL_USE_LIBRESSL ON CACHE BOOL "Use LibreSSL instead of OpenSSL" FORCE) set(OPENSSL_ROOT_DIR ${libressl_SOURCE_DIR} CACHE PATH "Path to LibreSSL root directory" FORCE) set(OPENSSL_CRYPTO_LIBRARY ${libressl_BINARY_DIR}/crypto/libcrypto.a CACHE FILEPATH "Path to LibreSSL crypto library" FORCE)