diff --git a/conanfile.py b/conanfile.py index b40f5458..71137d47 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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", @@ -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") diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index ddd998f1..94b0e3a7 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -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) @@ -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)