diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in index 8707602e5..b5283f4fb 100644 --- a/cmake/assimp-hunter-config.cmake.in +++ b/cmake/assimp-hunter-config.cmake.in @@ -3,12 +3,12 @@ find_package(RapidJSON CONFIG REQUIRED) find_package(ZLIB CONFIG REQUIRED) find_package(utf8cpp CONFIG REQUIRED) -find_package(irrXML CONFIG REQUIRED) find_package(minizip CONFIG REQUIRED) find_package(openddlparser CONFIG REQUIRED) find_package(poly2tri CONFIG REQUIRED) find_package(polyclipping CONFIG REQUIRED) find_package(zip CONFIG REQUIRED) +find_package(pugixml CONFIG REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index b0eb68814..b7d05867a 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -861,12 +861,12 @@ SET( Extra_SRCS ) SOURCE_GROUP( Extra FILES ${Extra_SRCS}) -# irrXML +# pugixml IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(irrXML) - find_package(irrXML CONFIG REQUIRED) + hunter_add_package(pugixml) + find_package(pugixml CONFIG REQUIRED) ELSE() - # irrXML already included in contrib directory by parent CMakeLists.txt. + add_subdirectory( pugixml-1.9 ) ENDIF() # utf8 @@ -1129,7 +1129,7 @@ IF(ASSIMP_HUNTER_ENABLED) TARGET_LINK_LIBRARIES(assimp PUBLIC polyclipping::polyclipping - irrXML::irrXML + pugixml::pugixml openddlparser::openddl_parser poly2tri::poly2tri minizip::minizip diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 43807d81a..e53832884 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1 +1,4 @@ -add_subdirectory( pugixml-1.9 ) + +IF(NOT ASSIMP_HUNTER_ENABLED) + add_subdirectory( pugixml-1.9 ) +ENDIF()