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

Update Hunter for pugixml

pull/3452/head
Rahul Sheth 2020-10-12 16:30:03 -04:00
parent 1df00143f5
commit f12e6eb6f4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -229,7 +229,6 @@ INCLUDE_DIRECTORIES( BEFORE
include include
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include
contrib/pugixml/src
) )
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules" ) LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules" )

17
code/CMakeLists.txt
View File

@ -862,11 +862,16 @@ SET( Extra_SRCS
SOURCE_GROUP( Extra FILES ${Extra_SRCS}) SOURCE_GROUP( Extra FILES ${Extra_SRCS})
# pugixml # pugixml
SET( Pugixml_SRCS IF(ASSIMP_HUNTER_ENABLED)
../contrib/pugixml/src/pugiconfig.hpp hunter_add_package(pugixml)
../contrib/pugixml/src/pugixml.hpp find_package(pugixml CONFIG REQUIRED)
) ELSE()
SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS}) SET( Pugixml_SRCS
../contrib/pugixml/src/pugiconfig.hpp
../contrib/pugixml/src/pugixml.hpp
)
SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
ENDIF()
# utf8 # utf8
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
@ -1026,6 +1031,7 @@ IF(ASSIMP_HUNTER_ENABLED)
ELSE() ELSE()
INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" )
INCLUDE_DIRECTORIES( "../contrib" ) INCLUDE_DIRECTORIES( "../contrib" )
INCLUDE_DIRECTORIES( "../contrib/pugixml/src" )
ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1 ) ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1 )
ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS ) ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
ENDIF() ENDIF()
@ -1136,6 +1142,7 @@ IF(ASSIMP_HUNTER_ENABLED)
RapidJSON::rapidjson RapidJSON::rapidjson
utf8cpp utf8cpp
zip::zip zip::zip
pugixml
) )
ELSE() ELSE()
TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ) TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )