generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-13 10:32:58 +01:00
Code Issues Projects Releases Wiki Activity

Switch to using submodule for nlohmann-json

Browse Source
This commit is contained in:
Tristan Penman 2022-08-30 13:07:33 +12:00
parent 582fd0fc13
commit fb995cebd3
4 changed files with 6 additions and 17301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -4,3 +4,7 @@
[submodule "thirdparty/rapidjson"] [submodule "thirdparty/rapidjson"]
path = thirdparty/rapidjson path = thirdparty/rapidjson
url = https://github.com/Tencent/rapidjson.git url = https://github.com/Tencent/rapidjson.git
[submodule "thirdparty/nlohmann-json"]
path = thirdparty/nlohmann-json
url = https://github.com/nlohmann/json.git
shallow = true

2
CMakeLists.txt
View File

@ -96,7 +96,7 @@ include_directories(include SYSTEM
thirdparty/jsoncpp-1.9.5/include thirdparty/jsoncpp-1.9.5/include
thirdparty/rapidjson/include thirdparty/rapidjson/include
thirdparty/picojson thirdparty/picojson
thirdparty/nlohmann-json-3.1.2 thirdparty/nlohmann-json/include
thirdparty/yaml-cpp-0.7.0/include thirdparty/yaml-cpp-0.7.0/include
) )

1
thirdparty/nlohmann-json vendored Submodule

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

17300
thirdparty/nlohmann-json-3.1.2/nlohmann/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff