GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detecting curl properly, disabled curl tests, building curl statically

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-07-22 14:45:09 +03:00
parent 0a7530f78d
commit 7772b09ad2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
3rdParty/curl/CMakeLists.txt vendored
View File

@@ -1,8 +1,7 @@
include(../../cmake/Utils.cmake) include(../../cmake/Utils.cmake)
set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl) set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl)
# find_package(CURL QUIET) find_package(CURL QUIET)
set(CURL_FOUND 0)
if (NOT ${CURL_FOUND}) if (NOT ${CURL_FOUND})
file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL}) file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL})
if (WIN32) if (WIN32)
@@ -29,8 +28,7 @@ else ()
endif () endif ()
function(LinkCurl TARGET) function(LinkCurl TARGET)
#find_package(CURL QUIET) find_package(CURL QUIET)
set(CURL_FOUND 0)
if (NOT ${CURL_FOUND}) if (NOT ${CURL_FOUND})
if (NOT WIN32) if (NOT WIN32)
target_link_libraries(${TARGET} PRIVATE curl) target_link_libraries(${TARGET} PRIVATE curl)

5
3rdParty/curl/ext_windows/CMakeLists.txt vendored
View File

@@ -16,6 +16,11 @@ FetchContent_Declare(
) )
FetchContent_MakeAvailable(libressl) 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(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_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) set(OPENSSL_CRYPTO_LIBRARY ${libressl_BINARY_DIR}/crypto/libcrypto.a CACHE FILEPATH "Path to LibreSSL crypto library" FORCE)