diff options
| author | bunnei <bunneidev@gmail.com> | 2017-07-12 21:31:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 21:31:12 -0400 |
| commit | 9cf261ba8ba4fd9929d275cc793d48d13df624f3 (patch) | |
| tree | 2eb47ab96bde081a84c5dd7c8107a21cb8a3511c /externals | |
| parent | 669757a97bb0b8324bf155ac84192e3975745789 (diff) | |
| parent | 28c35756790bfad06e339b82c551ab521268561b (diff) | |
Merge pull request #2819 from bunnei/telemetry-submit
Telemetry: Submit logged data to the Citra service
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 12 | ||||
| m--------- | externals/cpr | 0 | ||||
| m--------- | externals/json | 0 |
3 files changed, 12 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index cc47166fc..ccc7f13b6 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -52,3 +52,15 @@ endif() # ENet add_subdirectory(enet) target_include_directories(enet INTERFACE ./enet/include) + +if (ENABLE_WEB_SERVICE) + # CPR + option(BUILD_TESTING OFF) + option(BUILD_CPR_TESTS OFF) + add_subdirectory(cpr) + target_include_directories(cpr INTERFACE ./cpr/include) + + # JSON + add_library(json-headers INTERFACE) + target_include_directories(json-headers INTERFACE ./json/src) +endif() diff --git a/externals/cpr b/externals/cpr new file mode 160000 +Subproject b5758fbc88021437f968fe5174f121b8b92f5d5 diff --git a/externals/json b/externals/json new file mode 160000 +Subproject d3496347fcd1382896fca3aaf78a0d803c2f52e |