oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Update cpr submodule to upstream 

Upstream master now has the patches we need merged.
This commit is contained in:
Jason Rhinelander 2020-07-28 17:56:21 -03:00
parent 2083c58d35
commit f96350075c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -24,4 +24,4 @@
url = https://github.com/libuv/libuv.git
[submodule "external/cpr"]
path = external/cpr
url = https://github.com/jagerman/cpr.git
url = https://github.com/whoshuu/cpr.git

2
external/CMakeLists.txt vendored
View File

@ -126,7 +126,7 @@ target_compile_definitions(uWebSockets INTERFACE UWS_HTTPRESPONSE_NO_WRITEMARK U
# cpr configuration. Ideally we'd just do this via add_subdirectory, but cpr's cmake requires
# 3.15+, and we target lower than that (and this is fairly simple to build).
find_package(CURL REQUIRED COMPONENTS PROTOCOLS HTTP HTTPS FEATURES SSL)
find_package(CURL REQUIRED COMPONENTS HTTP HTTPS SSL)
file(GLOB cpr_sources ${conf_depends} cpr/cpr/*.cpp)

2
external/cpr vendored

@ -1 +1 @@
Subproject commit 5410d5503237c175df899f76310037b064879599
Subproject commit 451fd1a896c963367ebb3d77cfe4550b2d5636f3