Some more fixes for assimp
This commit is contained in:
4
3rdParty/assimp/CMakeLists.txt
vendored
4
3rdParty/assimp/CMakeLists.txt
vendored
@@ -3,7 +3,7 @@ include(FetchContent)
|
|||||||
unset(assimp_FOUND)
|
unset(assimp_FOUND)
|
||||||
find_package(assimp QUIET)
|
find_package(assimp QUIET)
|
||||||
message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}")
|
message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}")
|
||||||
if (assimp_FOUND)
|
if (assimp_FOUND OR ASSIMP_FOUND)
|
||||||
message("Using system assimp")
|
message("Using system assimp")
|
||||||
elseif (USE_ASSIMP)
|
elseif (USE_ASSIMP)
|
||||||
message("Building assimp from sources")
|
message("Building assimp from sources")
|
||||||
@@ -36,7 +36,7 @@ function(LinkAssimp TARGET)
|
|||||||
if (NOT assimp_BUILT)
|
if (NOT assimp_BUILT)
|
||||||
find_package(assimp QUIET)
|
find_package(assimp QUIET)
|
||||||
message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}")
|
message("assimp_FOUND: ${assimp_FOUND}; ASSIMP_FOUND: ${ASSIMP_FOUND}")
|
||||||
if (assimp_FOUND)
|
if (assimp_FOUND OR ASSIMP_FOUND)
|
||||||
set(ASSIMP_LIB_NAME ${ASSIMP_LIBRARIES})
|
set(ASSIMP_LIB_NAME ${ASSIMP_LIBRARIES})
|
||||||
endif ()
|
endif ()
|
||||||
else ()
|
else ()
|
||||||
|
|||||||
Reference in New Issue
Block a user