From 607d82f1342a83777496630e3e7a00c476aa36e6 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Tue, 8 Oct 2024 10:41:55 +0200 Subject: [PATCH] Some more fixes for assimp --- 3rdParty/assimp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdParty/assimp/CMakeLists.txt b/3rdParty/assimp/CMakeLists.txt index 6e5aa12..8c4c467 100644 --- a/3rdParty/assimp/CMakeLists.txt +++ b/3rdParty/assimp/CMakeLists.txt @@ -3,7 +3,7 @@ include(FetchContent) unset(assimp_FOUND) find_package(assimp QUIET) message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}") -if (assimp_FOUND) +if (assimp_FOUND OR ASSIMP_FOUND) message("Using system assimp") elseif (USE_ASSIMP) message("Building assimp from sources") @@ -36,7 +36,7 @@ function(LinkAssimp TARGET) if (NOT assimp_BUILT) find_package(assimp QUIET) message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}") - if (assimp_FOUND) + if (assimp_FOUND OR ASSIMP_FOUND) set(ASSIMP_LIB_NAME ${ASSIMP_LIBRARIES}) endif () else ()