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

Don't pull in entire JSON repo for single header file
This commit is contained in:
bunnei authored and GitHub committed 2017-07-18 13:26:57 -04:00
commit 5621a65037
5 files changed
+14524 -5

No files matched your search

-3
View File
@@ -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
+1 -1
View File
@@ -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()
-1
Submodule externals/json deleted from d3496347fc.
+7
View File
@@ -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
+14516
View File
File diff suppressed because it is too large. Load diff