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

Fix handling of toolcahin path

Browse Source
This commit is contained in:
Georg Hagen
2024-07-12 15:15:06 +02:00
parent d88a3f9e9e
commit d9d02daf59
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
3rdParty/libjpeg-turbo/CMakeLists.txt vendored
View File

@@ -5,8 +5,15 @@ if (libjpeg-turbo_FOUND)
message("Using system libjpeg-turbo")
else ()
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(
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
)
execute_process(
@@ -36,4 +43,4 @@ function(LinkLibJpegTurbo TARGET)
else ()
message(FATAL_ERROR "Neither static nor shared libjpeg-turbo exists")
endif ()
endfunction()
endfunction()