From ad93a28e31f83223e7dbb212d1cb70c49ed2c682 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Fri, 12 Jul 2024 16:16:45 +0200 Subject: [PATCH] Fix issue with finding the right libjpeg-turbo on mac --- 3rdParty/assimp/CMakeLists.txt | 4 ++-- 3rdParty/libjpeg-turbo/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/3rdParty/assimp/CMakeLists.txt b/3rdParty/assimp/CMakeLists.txt index a7179c4..1257178 100644 --- a/3rdParty/assimp/CMakeLists.txt +++ b/3rdParty/assimp/CMakeLists.txt @@ -26,7 +26,7 @@ elseif (USE_ASSIMP) FetchContent_MakeAvailable(assimp) - set(assimp_BUILT "fetched assimp found" CACHE INTERNAL ON) + set(assimp_BUILT ON CACHE INTERNAL "fetched assimp found") endif () @@ -37,4 +37,4 @@ function(LinkAssimp TARGET) if (assimp_FOUND OR assimp_BUILT) target_link_libraries(${TARGET} PUBLIC assimp) endif () -endfunction() \ No newline at end of file +endfunction() diff --git a/3rdParty/libjpeg-turbo/CMakeLists.txt b/3rdParty/libjpeg-turbo/CMakeLists.txt index eefbec3..256aa28 100644 --- a/3rdParty/libjpeg-turbo/CMakeLists.txt +++ b/3rdParty/libjpeg-turbo/CMakeLists.txt @@ -1,6 +1,8 @@ include(../../cmake/Utils.cmake) -Find_Package(libjpeg-turbo QUIET) +if (NOT IOS) + Find_Package(libjpeg-turbo QUIET) +endif() if (libjpeg-turbo_FOUND) message("Using system libjpeg-turbo") else ()