From 0f62d80ffbe27fe48203d1d724c53b58302e41ad Mon Sep 17 00:00:00 2001 From: Mars Ultor Date: Fri, 24 Oct 2025 23:06:24 -0500 Subject: [PATCH] using the nlohmann_json lib from now on --- .gitmodules | 7 +++---- CMakeLists.txt | 6 +++--- external/bitsery | 1 - external/json | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 160000 external/bitsery create mode 160000 external/json diff --git a/.gitmodules b/.gitmodules index 3ecde0e..81cdd56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,10 +7,9 @@ [submodule "external/tomlplusplus"] path = external/tomlplusplus url = https://github.com/marzer/tomlplusplus -[submodule "external/bitsery"] - path = external/bitsery - url = https://github.com/fraillt/bitsery - [submodule "external/duckdb"] path = external/duckdb url = https://github.com/duckdb/duckdb.git +[submodule "external/json"] + path = external/json + url = https://github.com/nlohmann/json diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a06a08..3fc3958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,20 +9,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) add_subdirectory(external/fmt) add_subdirectory(external/spdlog) add_subdirectory(external/tomlplusplus) -add_subdirectory(external/bitsery) add_subdirectory(external/duckdb) +add_subdirectory(external/json) # Executables add_executable(${PROJECT_NAME}-client src/main-tracker.cpp) add_executable(${PROJECT_NAME}-daemon src/main-daemon.cpp) # Common targets -set(COMMON_LIBS fmt spdlog tomlplusplus bitsery duckdb_static) +set(COMMON_LIBS fmt spdlog tomlplusplus duckdb_static nlohmann_json) set(COMMON_INCLUDES external/fmt/include external/spdlog/include external/tomlplusplus/include - external/bitsery/include/bitsery external/duckdb/src/include + external/json/include/nlohmann ) # Apply common settings diff --git a/external/bitsery b/external/bitsery deleted file mode 160000 index 9bebfd4..0000000 --- a/external/bitsery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9bebfd4911b8ef52c5a67754ccb87a8fd5223414 diff --git a/external/json b/external/json new file mode 160000 index 0000000..11cc676 --- /dev/null +++ b/external/json @@ -0,0 +1 @@ +Subproject commit 11cc676142d9ca85cc40a60330ed1b081c3afc6d