Fixed build on windows, passing git repos for openssl & curl, building only curl on apple
This commit is contained in:
8
3rdParty/curl/CMakeLists.txt
vendored
8
3rdParty/curl/CMakeLists.txt
vendored
@@ -2,10 +2,10 @@ include(../../cmake/Utils.cmake)
|
||||
|
||||
set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl)
|
||||
find_package(CURL QUIET)
|
||||
if (NOT DEFINED CURL_FOUND)
|
||||
if (NOT ${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
|
||||
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DCURL_REPO=${CURL_REPO} -DOPENSSL_REPO=${OPENSSL_REPO}
|
||||
WORKING_DIRECTORY ${CURL_DEPS_INSTALL}
|
||||
)
|
||||
execute_process(
|
||||
@@ -24,12 +24,14 @@ endif ()
|
||||
|
||||
function(LinkCurl TARGET BINARY_DIR)
|
||||
find_package(CURL QUIET)
|
||||
if (NOT DEFINED CURL_FOUND)
|
||||
if (NOT ${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)
|
||||
target_link_libraries(${TARGET} PRIVATE libcrypto.lib libssl.lib libcurl_imp.lib)
|
||||
elseif (APPLE)
|
||||
target_link_libraries(${TARGET} PRIVATE curl)
|
||||
else ()
|
||||
target_link_libraries(${TARGET} PRIVATE crypto ssl curl)
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user