blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 00:00:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #313 from dpaulat/renovate/cpr-1.x

Browse source 
Update dependency cpr to v1.11.1
This commit is contained in:
Dan Paulat 2025-01-06 10:14:18 -06:00 • committed by GitHub
commit 70c858d847
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
conanfile.py
View file

@ -6,7 +6,7 @@ import os
class SupercellWxConan(ConanFile): class SupercellWxConan(ConanFile):
settings = ("os", "compiler", "build_type", "arch") settings = ("os", "compiler", "build_type", "arch")
requires = ("boost/1.86.0", requires = ("boost/1.86.0",
"cpr/1.11.0", "cpr/1.11.1",
"fontconfig/2.15.0", "fontconfig/2.15.0",
"freetype/2.13.2", "freetype/2.13.2",
"geographiclib/2.4", "geographiclib/2.4",
@ -29,6 +29,10 @@ class SupercellWxConan(ConanFile):
"openssl/*:no_module": True, "openssl/*:no_module": True,
"openssl/*:shared" : True} "openssl/*:shared" : True}
def configure(self):
if self.settings.os == "Windows":
self.options["libcurl"].with_ssl = "schannel"
def requirements(self): def requirements(self):
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("onetbb/2021.12.0") self.requires("onetbb/2021.12.0")

2
wxdata/wxdata.cmake
View file

@ -5,6 +5,7 @@ project(scwx-data)
find_package(Boost) find_package(Boost)
find_package(cpr) find_package(cpr)
find_package(LibXml2) find_package(LibXml2)
find_package(OpenSSL)
find_package(re2) find_package(re2)
find_package(spdlog) find_package(spdlog)
@ -291,6 +292,7 @@ target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
aws-cpp-sdk-s3 aws-cpp-sdk-s3
cpr::cpr cpr::cpr
LibXml2::LibXml2 LibXml2::LibXml2
OpenSSL::Crypto
re2::re2 re2::re2
spdlog::spdlog spdlog::spdlog
units::units) units::units)