summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-06-28 04:28:13 +0200
committerbunnei <bunneidev@gmail.com>2017-07-09 19:24:20 +0200
commitcc7583e03669fcd5d2585c8ab539f7308460ced8 (patch)
tree36401d347a670c0de6520cf12213d98f483914a0
parentMerge pull request #2815 from mailwl/bossp (diff)
downloadyuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.gz
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.bz2
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.lz
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.xz
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.zst
yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.zip
-rw-r--r--.gitmodules3
-rw-r--r--externals/CMakeLists.txt6
m---------externals/cpr0
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index ac0df914d..493a0ad8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
[submodule "externals/enet"]
path = externals/enet
url = https://github.com/lsalzman/enet
+[submodule "cpr"]
+ path = externals/cpr
+ url = https://github.com/whoshuu/cpr.git
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index cc47166fc..ce10bda5e 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -4,6 +4,12 @@
add_library(catch-single-include INTERFACE)
target_include_directories(catch-single-include INTERFACE catch/single_include)
+# CPR
+option(BUILD_TESTING OFF)
+option(BUILD_CPR_TESTS OFF)
+add_subdirectory(cpr)
+target_include_directories(cpr INTERFACE ./cpr/include)
+
# Crypto++
add_subdirectory(cryptopp)
diff --git a/externals/cpr b/externals/cpr
new file mode 160000
+Subproject b5758fbc88021437f968fe5174f121b8b92f5d5