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

CMake changes of building openssl & curl on linux

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-06-21 00:41:12 +03:00
parent 406efa57e7
commit 3020b1a191
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
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)
if (NOT DEFINED curl_FOUND) if (NOT DEFINED CURL_FOUND)
file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL}) file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL})
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext
@@ -23,9 +23,9 @@ else ()
endif () endif ()
function(LinkCurl TARGET BINARY_DIR) function(LinkCurl TARGET BINARY_DIR)
find_package(curl QUIET) find_package(CURL QUIET)
if (NOT DEFINED CURL_FOUND)
set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl) set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl)
if (NOT DEFINED curl_FOUND)
target_include_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/include) target_include_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/include)
target_link_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/lib) target_link_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/lib)
if (MSVC) if (MSVC)
@@ -34,7 +34,7 @@ function(LinkCurl TARGET BINARY_DIR)
target_link_libraries(${TARGET} PRIVATE crypto ssl curl) target_link_libraries(${TARGET} PRIVATE crypto ssl curl)
endif () endif ()
else () else ()
target_include_directories(${TARGET} PRIVATE ${curl_INCLUDE_DIR}) target_include_directories(${TARGET} PRIVATE ${CURL_INCLUDE_DIR})
target_link_libraries(${TARGET} PRIVATE ${curl_LIBRARIES}) target_link_libraries(${TARGET} PRIVATE CURL::libcurl)
endif () endif ()
endfunction() endfunction()

2
3rdParty/curl/ext/CMakeLists.txt vendored
View File

@@ -17,7 +17,7 @@ if (MSVC)
set(OPENSSL_PERL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/src/openssl/Configure VC-WIN64A) set(OPENSSL_PERL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/src/openssl/Configure VC-WIN64A)
set(OPENSSL_MAKE_COMMAND nmake) set(OPENSSL_MAKE_COMMAND nmake)
else () 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) set(OPENSSL_MAKE_COMMAND make)
endif () endif ()