Merge pull request #2833 from j-selby/single-header-json

Don't pull in entire JSON repo for single header file
9 years ago · a32e38fba0
5 changed files with 14524 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -31,6 +31,3 @@
 [submodule "cpr"]
    path = externals/cpr
    url = https://github.com/whoshuu/cpr.git
-[submodule "json"]
-    path = externals/json
-    url = https://github.com/nlohmann/json.git
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -62,5 +62,5 @@ if (ENABLE_WEB_SERVICE)

    # JSON
    add_library(json-headers INTERFACE)
-    target_include_directories(json-headers INTERFACE ./json/src)
+    target_include_directories(json-headers INTERFACE ./json)
 endif()
--- a/externals/json
+++ b/externals/json
@ -1 +0,0 @@
-Subproject commit d3496347fcd1382896fca3aaf78a0d803c2f52ec
--- a/externals/json/README.md
+++ b/externals/json/README.md
@ -0,0 +1,7 @@
+JSON for Modern C++
+===================
+
+This is a mirror providing the single required header file.
+
+The original repository can be found at
+ https://github.com/nlohmann/json/commit/21d23982cafe826cae088b2bb37cb40c8e7a81fe
--- a/externals/json/json.hpp
+++ b/externals/json/json.hpp