瀏覽代碼

Update CMakeLists.txt

Kim Kulling 4 年之前
父節點
當前提交
742250c5fb
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      code/CMakeLists.txt

+ 4 - 4
code/CMakeLists.txt

@@ -1029,14 +1029,14 @@ 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" )
-  INCLUDE_DIRECTORIES( "../contrib/pugixml/src" )
-  ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1 )
+  INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
+  INCLUDE_DIRECTORIES("../contrib/pugixml/src")
+  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 )
   if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
   if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
     ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
     ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )