Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adaptions to support hunter

Browse Source
This commit is contained in:
kimkulling
2020-10-01 16:35:34 +02:00
parent d75fa2bb4b
commit b6dde74155
11 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/CMakeLists.txt
View File

@@ -866,7 +866,12 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(pugixml)
find_package(pugixml CONFIG REQUIRED)
ELSE()
add_subdirectory(../contrib/pugixml-1.9 )
SET( 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
@@ -1088,6 +1093,7 @@ SET( assimp_src
${openddl_parser_SRCS}
${open3dgc_SRCS}
${ziplib_SRCS}
${Pugixml_SRCS}
# Necessary to show the headers in the project when using the VC++ generator:
${PUBLIC_HEADERS}
@@ -1139,7 +1145,7 @@ IF(ASSIMP_HUNTER_ENABLED)
zip::zip
)
ELSE()
TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} pugixml )
TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )
ENDIF()
if(ASSIMP_ANDROID_JNIIOSYSTEM)