diff options
| author | bunnei <bunneidev@gmail.com> | 2017-07-09 19:22:24 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2017-07-10 00:38:02 +0200 |
| commit | 0f1ae781d08bc3edd360598938aac58f7ef1dc1a (patch) | |
| tree | 0d3938471dffc1b2ec09cb4348c3d958aac9a52b | |
| parent | externals: Add CPR as a submodule. (diff) | |
| download | yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.gz yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.bz2 yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.lz yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.xz yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.tar.zst yuzu-0f1ae781d08bc3edd360598938aac58f7ef1dc1a.zip | |
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| m--------- | externals/json | 0 |
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 @@ [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 ce10bda5e..11c5d8e7d 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 +Subproject d3496347fcd1382896fca3aaf78a0d803c2f52e |