Asset Loader: fixed rapidjson option

DiligentGraphics · Jul 22, 2024 · 142388a · 142388a
1 parent 559ab5c
commit 142388a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/AssetLoader/CMakeLists.txt b/AssetLoader/CMakeLists.txt
@@ -67,7 +67,7 @@ elseif (DRACO_PATH)
     endif()
 endif()
 
-if(DILIGENT_USE_RAPID_JSON)
+if(DILIGENT_USE_RAPIDJSON)
     FetchContent_DeclareShallowGit(
         rapidjson
         GIT_REPOSITORY https://github.com/Tencent/rapidjson
@@ -77,7 +77,8 @@ if(DILIGENT_USE_RAPID_JSON)
     set(RAPIDJSON_BUILD_EXAMPLES OFF)
     set(RAPIDJSON_BUILD_TESTS OFF)
     FetchContent_MakeAvailable(rapidjson)
-    target_link_libraries(Diligent-AssetLoader PRIVATE RapidJSON)
+    target_include_directories(Diligent-AssetLoader PRIVATE ${rapidjson_SOURCE_DIR}/include/rapidjson)
+    target_compile_definitions(Diligent-AssetLoader PRIVATE TINYGLTF_USE_RAPIDJSON TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR)
 endif()
 
 set_target_properties(Diligent-AssetLoader PROPERTIES

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 option(DILIGENT_NO_RENDER_STATE_PACKAGER "Do not build Render State Packager" OFF)
 option(DILIGENT_ENABLE_DRACO "Enable Draco compression support in GLTF loader" OFF)
-option(DILIGENT_USE_RAPID_JSON "Use rapidjson parser in GLTF loader" OFF)
+option(DILIGENT_USE_RAPIDJSON "Use rapidjson parser in GLTF loader" OFF)
 
 # Clear the list
 set(DILIGENT_TOOLS_INSTALL_LIBS_LIST "" CACHE INTERNAL "Diligent tools libraries installation list")