From d0ffceca986a7b62de38311d8f2f66e0ca5c32ab Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Thu, 30 May 2024 10:50:07 +0200 Subject: [PATCH] Make search for libjpeg-turbo more reliable --- 3rdParty/libjpeg-turbo/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/3rdParty/libjpeg-turbo/CMakeLists.txt b/3rdParty/libjpeg-turbo/CMakeLists.txt index 162f036..4b6d661 100644 --- a/3rdParty/libjpeg-turbo/CMakeLists.txt +++ b/3rdParty/libjpeg-turbo/CMakeLists.txt @@ -1,4 +1,5 @@ include(FetchContent) +include(../../cmake/Utils.cmake) Find_Package(libjpeg-turbo QUIET) if (libjpeg-turbo_FOUND) @@ -23,10 +24,10 @@ endif () function(LinkLibJpegTurbo TARGET) if (libjpeg-turbo_BUILT) - list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps_ljt/INSTALL/lib/cmake) + FindCmakeConfigDirs("${CMAKE_BINARY_DIR}/deps_ljt/INSTALL/" CMAKE_PREFIX_PATH) endif() find_package(libjpeg-turbo REQUIRED) - message("${libjpeg-turbo_LIBRARIES}") + message("libjpeg-turbo was found in: ${libjpeg-turbo_DIR}") if (TARGET libjpeg-turbo::turbojpeg-static) target_link_libraries(${TARGET} PUBLIC libjpeg-turbo::turbojpeg-static) message("Linking static libjpeg-turbo")