From 0f1ae781d08bc3edd360598938aac58f7ef1dc1a Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 9 Jul 2017 13:22:24 -0400 Subject: [PATCH] externals: Add JSON as a submodule. --- .gitmodules | 3 +++ externals/CMakeLists.txt | 4 ++++ externals/json | 1 + 3 files changed, 8 insertions(+) create mode 160000 externals/json diff --git a/.gitmodules b/.gitmodules index 493a0ad8f3..45ff650ef6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "cpr"] path = externals/cpr url = https://github.com/whoshuu/cpr.git +[submodule "json"] + path = externals/json + url = https://github.com/nlohmann/json.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index ce10bda5e8..11c5d8e7d9 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -34,6 +34,10 @@ add_subdirectory(glad) # inih add_subdirectory(inih) +# JSON +add_library(json-headers INTERFACE) +target_include_directories(json-headers INTERFACE ./json/src) + # MicroProfile add_library(microprofile INTERFACE) target_include_directories(microprofile INTERFACE ./microprofile) diff --git a/externals/json b/externals/json new file mode 160000 index 0000000000..d3496347fc --- /dev/null +++ b/externals/json @@ -0,0 +1 @@ +Subproject commit d3496347fcd1382896fca3aaf78a0d803c2f52ec