From 51127241ef63ad975ec091281c00edc064f732b5 Mon Sep 17 00:00:00 2001 From: William JCM Date: Wed, 28 Jul 2021 14:17:47 +0200 Subject: [PATCH] Add json.hpp as the JSON lib. --- .gitmodules | 4 ++++ CMakeLists.txt | 3 +++ src/CMakeLists.txt | 1 + third-party/json | 1 + 4 files changed, 9 insertions(+) create mode 160000 third-party/json diff --git a/.gitmodules b/.gitmodules index fb0120f..b7b534a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = third-party/cpr url = https://github.com/whoshuu/cpr branch = master +[submodule "json.hpp"] + path = third-party/json + url = https://github.com/nlohmann/json + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 6754213..5281f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,4 +92,7 @@ set(CPR_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # For some reason, even when HTTP_ONLY is set to ON, libcurl will try to link to libssh2. add_subdirectory(third-party/cpr EXCLUDE_FROM_ALL) +set(JSON_BuildTests OFF CACHE BOOL "" FORCE) +add_subdirectory(third-party/json) + add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54044ac..c9a5540 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,5 +78,6 @@ target_link_libraries(MassBuilderSaveTool PRIVATE efsw zip cpr::cpr + nlohmann_json::nlohmann_json imm32 wtsapi32) diff --git a/third-party/json b/third-party/json new file mode 160000 index 0000000..350ff4f --- /dev/null +++ b/third-party/json @@ -0,0 +1 @@ +Subproject commit 350ff4f7ced7c4117eae2fb93df02823c8021fcb