Passthrough generator flags
This commit is contained in:
6
3rdParty/curl/CMakeLists.txt
vendored
6
3rdParty/curl/CMakeLists.txt
vendored
@@ -5,7 +5,7 @@ find_package(CURL QUIET)
|
||||
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 -DCURL_REPO=${CURL_REPO} -DOPENSSL_REPO=${OPENSSL_REPO}
|
||||
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DCURL_REPO=${CURL_REPO} -DOPENSSL_REPO=${OPENSSL_REPO} -DPLATFORM=${PLATFORM}
|
||||
WORKING_DIRECTORY ${CURL_DEPS_INSTALL}
|
||||
)
|
||||
execute_process(
|
||||
@@ -22,10 +22,10 @@ else ()
|
||||
set(USING_SYSTEM_CURL ON PARENT_SCOPE)
|
||||
endif ()
|
||||
|
||||
function(LinkCurl TARGET BINARY_DIR)
|
||||
function(LinkCurl TARGET)
|
||||
find_package(CURL QUIET)
|
||||
if (NOT ${CURL_FOUND})
|
||||
set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl)
|
||||
set(CURL_DEPS_INSTALL ${CMAKE_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)
|
||||
|
||||
5
3rdParty/curl/ext/CMakeLists.txt
vendored
5
3rdParty/curl/ext/CMakeLists.txt
vendored
@@ -42,7 +42,10 @@ if (APPLE)
|
||||
CMAKE_ARGS
|
||||
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${TOOLCHAIN_FILE}
|
||||
-DCMAKE_BUILD_TYPE:STRING=Release
|
||||
-DCURL_USE_OPENSSL:BOOL=ON
|
||||
-DCURL_USE_OPENSSL:BOOL=OFF
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||
-DBUILD_STATIC_LIBS:BOOL=OFF
|
||||
-DBUILD_CURL_EXE:BOOL=OFF
|
||||
-DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/INSTALL
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/INSTALL
|
||||
BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/curl-build --config Release
|
||||
|
||||
Reference in New Issue
Block a user