summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2017-07-09 13:22:24 -0400
committerGravatar bunnei2017-07-09 18:38:02 -0400
commit0f1ae781d08bc3edd360598938aac58f7ef1dc1a (patch)
tree0d3938471dffc1b2ec09cb4348c3d958aac9a52b
parentexternals: Add CPR as a submodule. (diff)
downloadyuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.gz
yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.xz
yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.zip
externals: Add JSON as a submodule.
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--externals/CMakeLists.txt4
m---------externals/json0
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 493a0ad8f..45ff650ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
31[submodule "cpr"] 31[submodule "cpr"]
32 path = externals/cpr 32 path = externals/cpr
33 url = https://github.com/whoshuu/cpr.git 33 url = https://github.com/whoshuu/cpr.git
34[submodule "json"]
35 path = externals/json
36 url = https://github.com/nlohmann/json.git
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index ce10bda5e..11c5d8e7d 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -34,6 +34,10 @@ add_subdirectory(glad)
34# inih 34# inih
35add_subdirectory(inih) 35add_subdirectory(inih)
36 36
37# JSON
38add_library(json-headers INTERFACE)
39target_include_directories(json-headers INTERFACE ./json/src)
40
37# MicroProfile 41# MicroProfile
38add_library(microprofile INTERFACE) 42add_library(microprofile INTERFACE)
39target_include_directories(microprofile INTERFACE ./microprofile) 43target_include_directories(microprofile INTERFACE ./microprofile)
diff --git a/externals/json b/externals/json
new file mode 160000
Subproject d3496347fcd1382896fca3aaf78a0d803c2f52e