cmake: rename RapidJSON declaration to rjlib (#6567)
This helps alleviate an issue with some weird imports happening that is causing reconfigures on Windows to fail.
This commit is contained in:
+1
-1
@@ -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)
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
+1
-1
Submodule lib/serialize updated: bfbf304924...a186548aae
+1
-1
Submodule lib/settings updated: 8620c42684...ae393eaa81
Reference in New Issue
Block a user