v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow usage of pugixml from a superproject (#5752) 

When using CMake subprojects with an existing build of pugixml
this prevents Assimp from using its own copy.
pull/5743/head^2
Tobias Rittig, Ph.D. 2024-09-03 21:45:30 +02:00 committed by GitHub
parent c1ffbfec06
commit f69e55058d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/CMakeLists.txt
View File

@ -1053,7 +1053,7 @@ ENDIF() # IF (ASSIMP_BUILD_USD_IMPORTER)
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(pugixml) hunter_add_package(pugixml)
find_package(pugixml CONFIG REQUIRED) find_package(pugixml CONFIG REQUIRED)
ELSE() ELSEIF(NOT TARGET pugixml::pugixml)
SET( Pugixml_SRCS SET( Pugixml_SRCS
../contrib/pugixml/src/pugiconfig.hpp ../contrib/pugixml/src/pugiconfig.hpp
../contrib/pugixml/src/pugixml.hpp ../contrib/pugixml/src/pugixml.hpp
@ -1439,6 +1439,9 @@ ELSE()
if (ASSIMP_BUILD_DRACO) if (ASSIMP_BUILD_DRACO)
target_link_libraries(assimp ${draco_LIBRARIES}) target_link_libraries(assimp ${draco_LIBRARIES})
endif() endif()
if(TARGET pugixml::pugixml)
target_link_libraries(assimp pugixml::pugixml)
endif()
ENDIF() ENDIF()
if(ASSIMP_ANDROID_JNIIOSYSTEM) if(ASSIMP_ANDROID_JNIIOSYSTEM)