oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Add nlohmann-json submodule

This commit is contained in:
Jason Rhinelander 2021-08-12 13:33:05 -03:00 committed by Thomas Winget
parent 2b568f02d2
commit 02f1b5b982
5 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -34,3 +34,6 @@
[submodule "external/SQLiteCpp"]
path = external/SQLiteCpp
url = https://github.com/SRombauts/SQLiteCpp
[submodule "external/nlohmann-json"]
path = external/nlohmann-json
url = https://github.com/nlohmann/json.git

3
external/CMakeLists.txt vendored
View File

@ -85,6 +85,9 @@ add_subdirectory(easylogging++ easyloggingpp)
add_subdirectory(randomx EXCLUDE_FROM_ALL)
add_subdirectory(fmt)
set(JSON_MultipleHeaders ON CACHE BOOL "") # Allows multi-header nlohmann use
add_subdirectory(nlohmann-json)
# uSockets doesn't really have a proper build system (just a very simple Makefile) so build it
# ourselves.
if (NOT CMAKE_VERSION VERSION_LESS 3.12)

1
external/nlohmann-json vendored Submodule

@ -0,0 +1 @@
Subproject commit db78ac1d7716f56fc9f1b030b715f872f93964e4

1
src/cryptonote_core/CMakeLists.txt
View File

@ -53,6 +53,7 @@ target_link_libraries(cryptonote_core
device
checkpoints
SQLite::SQLite3
nlohmann_json::nlohmann_json
PRIVATE
Boost::program_options
systemd

3
src/rpc/CMakeLists.txt
View File

@ -55,6 +55,7 @@ target_link_libraries(rpc_commands
PUBLIC
common
cpr::cpr
nlohmann_json::nlohmann_json
PRIVATE
cryptonote_protocol
extra)
@ -63,6 +64,7 @@ target_link_libraries(rpc_server_base
PUBLIC
common
uWebSockets
nlohmann_json::nlohmann_json
PRIVATE
extra)
@ -91,5 +93,6 @@ target_link_libraries(rpc_http_client
PUBLIC
common
cpr::cpr
nlohmann_json::nlohmann_json
PRIVATE
extra)