From d9d02daf59bfe16fef09943dd750b6733fbc3c9e Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Fri, 12 Jul 2024 15:15:06 +0200 Subject: [PATCH] Fix handling of toolcahin path --- 3rdParty/libjpeg-turbo/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/3rdParty/libjpeg-turbo/CMakeLists.txt b/3rdParty/libjpeg-turbo/CMakeLists.txt index d645719..eefbec3 100644 --- a/3rdParty/libjpeg-turbo/CMakeLists.txt +++ b/3rdParty/libjpeg-turbo/CMakeLists.txt @@ -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() \ No newline at end of file +endfunction()