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

Merge remote-tracking branch 'origin/master' into project_setup_refactor

Browse Source 
# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Georg Hagen
2024-08-14 22:47:19 +02:00
parent 729d1f3e55 3ecfd98b14
commit 840ff67f01
61 changed files with 2489 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,15 +7,8 @@ if (libjpeg-turbo_FOUND)
message("Using system libjpeg-turbo")
elseif (NOT IOS)
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=${TOOLCHAIN} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN} -DPLATFORM=${PLATFORM} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt
)
execute_process(