Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency cpr to v1.11.1 #313

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Update dependency cpr to v1.11.1 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
097df78
Update dependency cpr to v1.11.1
renovate[bot] Jan 5, 2025
5170136
Use schannel with libcurl
dpaulat Jan 6, 2025
f156716
Add OpenSSL::Crypto as a dependency for wxdata
dpaulat Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class SupercellWxConan(ConanFile):
settings = ("os", "compiler", "build_type", "arch")
requires = ("boost/1.86.0",
"cpr/1.11.0",
"cpr/1.11.1",
"fontconfig/2.15.0",
"freetype/2.13.2",
"geographiclib/2.4",
Expand All @@ -29,6 +29,10 @@ class SupercellWxConan(ConanFile):
"openssl/*:no_module": True,
"openssl/*:shared" : True}

def configure(self):
if self.settings.os == "Windows":
self.options["libcurl"].with_ssl = "schannel"

def requirements(self):
if self.settings.os == "Linux":
self.requires("onetbb/2021.12.0")
Expand Down
2 changes: 2 additions & 0 deletions wxdata/wxdata.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ project(scwx-data)
find_package(Boost)
find_package(cpr)
find_package(LibXml2)
find_package(OpenSSL)
find_package(re2)
find_package(spdlog)

Expand Down Expand Up @@ -291,6 +292,7 @@ target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
aws-cpp-sdk-s3
cpr::cpr
LibXml2::LibXml2
OpenSSL::Crypto
re2::re2
spdlog::spdlog
units::units)
Expand Down