Fix handling of toolcahin path
This commit is contained in:
9
3rdParty/libjpeg-turbo/CMakeLists.txt
vendored
9
3rdParty/libjpeg-turbo/CMakeLists.txt
vendored
@@ -5,8 +5,15 @@ if (libjpeg-turbo_FOUND)
|
|||||||
message("Using system libjpeg-turbo")
|
message("Using system libjpeg-turbo")
|
||||||
else ()
|
else ()
|
||||||
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt)
|
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt)
|
||||||
|
if (CMAKE_TOOLCHAIN_FILE)
|
||||||
|
if(NOT IS_ABSOLUTE ${CMAKE_TOOLCHAIN_FILE})
|
||||||
|
set(TOOLCHAIN "${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
|
||||||
|
else()
|
||||||
|
set(TOOLCHAIN "${CMAKE_TOOLCHAIN_FILE}")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
|
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
|
||||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt
|
||||||
)
|
)
|
||||||
execute_process(
|
execute_process(
|
||||||
|
|||||||
Reference in New Issue
Block a user