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

hunter integration: pugixml

pull/2966/head
kimkulling 2020-10-01 10:29:52 +02:00
parent c7f7ed8901
commit c740f61f97
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/assimp-hunter-config.cmake.in
View File

@ -3,12 +3,12 @@
find_package(RapidJSON CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED)
find_package(ZLIB CONFIG REQUIRED) find_package(ZLIB CONFIG REQUIRED)
find_package(utf8cpp CONFIG REQUIRED) find_package(utf8cpp CONFIG REQUIRED)
find_package(irrXML CONFIG REQUIRED)
find_package(minizip CONFIG REQUIRED) find_package(minizip CONFIG REQUIRED)
find_package(openddlparser CONFIG REQUIRED) find_package(openddlparser CONFIG REQUIRED)
find_package(poly2tri CONFIG REQUIRED) find_package(poly2tri CONFIG REQUIRED)
find_package(polyclipping CONFIG REQUIRED) find_package(polyclipping CONFIG REQUIRED)
find_package(zip CONFIG REQUIRED) find_package(zip CONFIG REQUIRED)
find_package(pugixml CONFIG REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
check_required_components("@PROJECT_NAME@") check_required_components("@PROJECT_NAME@")

10
code/CMakeLists.txt
View File

@ -861,12 +861,12 @@ SET( Extra_SRCS
) )
SOURCE_GROUP( Extra FILES ${Extra_SRCS}) SOURCE_GROUP( Extra FILES ${Extra_SRCS})
# irrXML # pugixml
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(irrXML) hunter_add_package(pugixml)
find_package(irrXML CONFIG REQUIRED) find_package(pugixml CONFIG REQUIRED)
ELSE() ELSE()
# irrXML already included in contrib directory by parent CMakeLists.txt. add_subdirectory( pugixml-1.9 )
ENDIF() ENDIF()
# utf8 # utf8
@ -1129,7 +1129,7 @@ IF(ASSIMP_HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp TARGET_LINK_LIBRARIES(assimp
PUBLIC PUBLIC
polyclipping::polyclipping polyclipping::polyclipping
irrXML::irrXML pugixml::pugixml
openddlparser::openddl_parser openddlparser::openddl_parser
poly2tri::poly2tri poly2tri::poly2tri
minizip::minizip minizip::minizip

5
contrib/CMakeLists.txt
View File

@ -1 +1,4 @@
add_subdirectory( pugixml-1.9 )
IF(NOT ASSIMP_HUNTER_ENABLED)
add_subdirectory( pugixml-1.9 )
ENDIF()