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

Update CMakeLists.txt

pull/3889/head
Kim Kulling 2021-06-03 23:56:52 +02:00 committed by GitHub
parent b0e7271449
commit 84db4d3a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMakeLists.txt
View File

@ -1029,12 +1029,12 @@ ELSE ()
ENDIF () ENDIF ()
# RapidJSON # RapidJSON
INCLUDE_DIRECTORIES( "../contrib" )
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(RapidJSON) hunter_add_package(RapidJSON)
find_package(RapidJSON CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED)
ELSE() ELSE()
INCLUDE_DIRECTORIES("../contrib/rapidjson/include") INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
INCLUDE_DIRECTORIES( "../contrib" )
INCLUDE_DIRECTORIES("../contrib/pugixml/src") INCLUDE_DIRECTORIES("../contrib/pugixml/src")
ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON ) option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )