Update CMakeLists.txt
parent
a716f741d8
commit
742250c5fb
|
@ -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 )
|
||||||
|
|
Loading…
Reference in New Issue