using the nlohmann_json lib from now on

This commit is contained in:
Mars Ultor
2025-10-24 23:06:24 -05:00
parent bbed6bb653
commit 0f62d80ffb
4 changed files with 7 additions and 8 deletions
+3 -4
View File
@@ -7,10 +7,9 @@
[submodule "external/tomlplusplus"] [submodule "external/tomlplusplus"]
path = external/tomlplusplus path = external/tomlplusplus
url = https://github.com/marzer/tomlplusplus url = https://github.com/marzer/tomlplusplus
[submodule "external/bitsery"]
path = external/bitsery
url = https://github.com/fraillt/bitsery
[submodule "external/duckdb"] [submodule "external/duckdb"]
path = external/duckdb path = external/duckdb
url = https://github.com/duckdb/duckdb.git url = https://github.com/duckdb/duckdb.git
[submodule "external/json"]
path = external/json
url = https://github.com/nlohmann/json
+3 -3
View File
@@ -9,20 +9,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
add_subdirectory(external/fmt) add_subdirectory(external/fmt)
add_subdirectory(external/spdlog) add_subdirectory(external/spdlog)
add_subdirectory(external/tomlplusplus) add_subdirectory(external/tomlplusplus)
add_subdirectory(external/bitsery)
add_subdirectory(external/duckdb) add_subdirectory(external/duckdb)
add_subdirectory(external/json)
# Executables # Executables
add_executable(${PROJECT_NAME}-client src/main-tracker.cpp) add_executable(${PROJECT_NAME}-client src/main-tracker.cpp)
add_executable(${PROJECT_NAME}-daemon src/main-daemon.cpp) add_executable(${PROJECT_NAME}-daemon src/main-daemon.cpp)
# Common targets # Common targets
set(COMMON_LIBS fmt spdlog tomlplusplus bitsery duckdb_static) set(COMMON_LIBS fmt spdlog tomlplusplus duckdb_static nlohmann_json)
set(COMMON_INCLUDES set(COMMON_INCLUDES
external/fmt/include external/fmt/include
external/spdlog/include external/spdlog/include
external/tomlplusplus/include external/tomlplusplus/include
external/bitsery/include/bitsery
external/duckdb/src/include external/duckdb/src/include
external/json/include/nlohmann
) )
# Apply common settings # Apply common settings
-1
Submodule external/bitsery deleted from 9bebfd4911
Vendored Submodule
+1
Submodule external/json added at 11cc676142