diff options
| author |  bunnei | 2017-06-27 22:28:13 -0400 |
|---|---|---|
| committer | bunnei | 2017-07-09 13:24:20 -0400 |
| commit | cc7583e03669fcd5d2585c8ab539f7308460ced8 (patch) | |
| tree | 36401d347a670c0de6520cf12213d98f483914a0 | |
| parent | Merge pull request #2815 from mailwl/bossp (diff) | |
| download | yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.gz yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.tar.xz yuzu-cc7583e03669fcd5d2585c8ab539f7308460ced8.zip | |
externals: Add CPR as a submodule.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/cpr | 0 |
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 @@ | |||
| 28 | [submodule "externals/enet"] | 28 | [submodule "externals/enet"] |
| 29 | path = externals/enet | 29 | path = externals/enet |
| 30 | url = https://github.com/lsalzman/enet | 30 | url = https://github.com/lsalzman/enet |
| 31 | [submodule "cpr"] | ||
| 32 | path = externals/cpr | ||
| 33 | 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 @@ | |||
| 4 | add_library(catch-single-include INTERFACE) | 4 | add_library(catch-single-include INTERFACE) |
| 5 | target_include_directories(catch-single-include INTERFACE catch/single_include) | 5 | target_include_directories(catch-single-include INTERFACE catch/single_include) |
| 6 | 6 | ||
| 7 | # CPR | ||
| 8 | option(BUILD_TESTING OFF) | ||
| 9 | option(BUILD_CPR_TESTS OFF) | ||
| 10 | add_subdirectory(cpr) | ||
| 11 | target_include_directories(cpr INTERFACE ./cpr/include) | ||
| 12 | |||
| 7 | # Crypto++ | 13 | # Crypto++ |
| 8 | add_subdirectory(cryptopp) | 14 | add_subdirectory(cryptopp) |
| 9 | 15 | ||
diff --git a/externals/cpr b/externals/cpr new file mode 160000 | |||
| Subproject b5758fbc88021437f968fe5174f121b8b92f5d5 | |||