diff --git a/CHANGELOG.md b/CHANGELOG.md index 667ff703..26840fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,7 +36,7 @@ - Def: Fixed compilation error in tests with Clang 21. (#6519) - Dev: Fixed compilation warnings on clang-cl. (#6528) - Dev: Fixed compilation error in tests with Clang 21. (#6519) -- Dev: Use CMake's `FetchContent` for RapidJSON, PajladaSignals, PajladaSerialize, and PajladaSettings. (#6560) +- Dev: Use CMake's `FetchContent` for RapidJSON, PajladaSignals, PajladaSerialize, and PajladaSettings. (#6560, #6567) - Dev: The LuaLS meta files moved from `docs/plugin-meta.lua` to `docs/lua-meta/globals.lua`. (#6530) - Dev: Compile time definitions for `Windows.h` are now conditional based on `WIN32` instead of `MSVC`. (#6534) - Dev: Refactored split container nodes to use shared pointers. (#6435) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b0838d..4d9983e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ if (BUILD_BENCHMARKS) endif () FetchContent_Declare( - rapidjson + rjlib SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson EXCLUDE_FROM_ALL FIND_PACKAGE_ARGS NAMES RapidJSON @@ -248,7 +248,7 @@ FetchContent_Declare( EXCLUDE_FROM_ALL ) -FetchContent_MakeAvailable(rapidjson PajladaSignals PajladaSerialize PajladaSettings) +FetchContent_MakeAvailable(rjlib PajladaSignals PajladaSerialize PajladaSettings) find_package(LRUCache REQUIRED) find_package(MagicEnum REQUIRED) diff --git a/lib/serialize b/lib/serialize index bfbf3049..a186548a 160000 --- a/lib/serialize +++ b/lib/serialize @@ -1 +1 @@ -Subproject commit bfbf304924328bd6fecfd7bf229434387351cc10 +Subproject commit a186548aae372b9b4e69fc08de09886f3aa4240b diff --git a/lib/settings b/lib/settings index 8620c426..ae393eaa 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 8620c426849a45040ade97111ab2bde72b1a7c9a +Subproject commit ae393eaa81154f1e35872aff333a619a451f7eae