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

remove all hunter-dependencies for pugixml.

pull/2966/head
Kim Kulling 2020-10-05 18:53:42 +02:00
parent 23f144a7b7
commit 52826a03f8
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -210,7 +210,7 @@ IF(NOT GIT_COMMIT_HASH)
ENDIF() ENDIF()
IF(ASSIMP_DOUBLE_PRECISION) IF(ASSIMP_DOUBLE_PRECISION)
ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION) ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
ENDIF() ENDIF()
CONFIGURE_FILE( CONFIGURE_FILE(

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

@ -8,7 +8,6 @@ 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@")

17
code/CMakeLists.txt
View File

@ -862,17 +862,11 @@ SET( Extra_SRCS
SOURCE_GROUP( Extra FILES ${Extra_SRCS}) SOURCE_GROUP( Extra FILES ${Extra_SRCS})
# pugixml # pugixml
IF(ASSIMP_HUNTER_ENABLED) SET( Pugixml_SRCS
hunter_add_package(pugixml) ../contrib/pugixml/src/pugiconfig.hpp
find_package(pugixml CONFIG REQUIRED) ../contrib/pugixml/src/pugixml.hpp
ELSE() )
SET( Pugixml_SRCS SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
../contrib/pugixml/src/pugiconfig.hpp
../contrib/pugixml/src/pugixml.hpp
#../contrib/pugixml/src/pugixml.cpp
)
SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
ENDIF()
# utf8 # utf8
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
@ -1135,7 +1129,6 @@ IF(ASSIMP_HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp TARGET_LINK_LIBRARIES(assimp
PUBLIC PUBLIC
polyclipping::polyclipping polyclipping::polyclipping
pugixml::pugixml
openddlparser::openddl_parser openddlparser::openddl_parser
poly2tri::poly2tri poly2tri::poly2tri
minizip::minizip minizip::minizip