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

aws-sdk-cpp use openssl #8554

Merged
merged 2 commits into from
Jan 6, 2022
Merged

aws-sdk-cpp use openssl #8554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24aa093
aws-sdk-cpp use openssl
MartinDelille Dec 27, 2021
c8e7f98
Always use aws-c-common/0.6.15
MartinDelille Dec 27, 2021
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
12 changes: 8 additions & 4 deletions recipes/aws-sdk-cpp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,12 @@ def validate(self):
See https://github.com/aws/aws-sdk-cpp/issues/1542""")

def requirements(self):
self.requires("aws-c-common/0.6.9")
self.requires("aws-c-common/0.6.15")
if self._use_aws_crt_cpp:
self.requires("aws-c-cal/0.5.12")
self.requires("aws-c-io/0.10.9")
self.requires("aws-crt-cpp/0.14.3")
self.requires("aws-c-http/0.6.10")
self.requires("aws-c-io/0.10.13")
self.requires("aws-crt-cpp/0.17.12")
else:
self.requires("aws-c-event-stream/0.1.5")
if self.settings.os != "Windows":
Expand Down Expand Up @@ -379,6 +380,8 @@ def _configure_cmake(self):
self._cmake.definitions["ENABLE_TESTING"] = False
self._cmake.definitions["AUTORUN_UNIT_TESTS"] = False
self._cmake.definitions["BUILD_DEPS"] = False
if self.settings.os != "Windows":
self._cmake.definitions["ENABLE_OPENSSL_ENCRYPTION"] = True

self._cmake.definitions["MINIMIZE_SIZE"] = self.options.min_size
if self.settings.compiler == "Visual Studio" and not self._use_aws_crt_cpp:
Expand Down Expand Up @@ -421,8 +424,9 @@ def package_info(self):
self.cpp_info.components["core"].requires = ["aws-c-common::aws-c-common-lib"]
if self._use_aws_crt_cpp:
self.cpp_info.components["core"].requires.extend([
"aws-c-io::aws-c-io-lib",
"aws-c-cal::aws-c-cal-lib",
"aws-c-http::aws-c-http-lib",
"aws-c-io::aws-c-io-lib",
"aws-crt-cpp::aws-crt-cpp-lib",
])
else:
Expand Down