using the nlohmann_json lib from now on
This commit is contained in:
7
.gitmodules
vendored
7
.gitmodules
vendored
@@ -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
|
||||||
|
|||||||
@@ -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
external/bitsery
vendored
1
external/bitsery
vendored
Submodule external/bitsery deleted from 9bebfd4911
1
external/json
vendored
Submodule
1
external/json
vendored
Submodule
Submodule external/json added at 11cc676142
Reference in New Issue
Block a user