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] Add s3-crt component #9248

Merged
merged 2 commits into from
Feb 14, 2022
+5 −2
Merged

[aws-sdk-cpp] Add s3-crt component #9248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd4b35
[aws-sdk-cpp] Add s3-crt component
jeremy-coulon Feb 3, 2022
065417f
[aws-sdk-cpp] s3-crt only for version >= 1.9
jeremy-coulon Feb 4, 2022
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
7 changes: 5 additions & 2 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 @@ -228,6 +228,7 @@ class AwsSdkCppConan(ConanFile):
"route53domains",
"route53resolver",
"s3",
"s3-crt",
"s3-encryption",
"s3control",
"s3outposts",
Expand Down Expand Up @@ -336,6 +337,8 @@ def export_sources(self):
def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
if tools.Version(self.version) < "1.9":
delattr(self.options, "s3-crt")
uilianries marked this conversation as resolved.
Show resolved Hide resolved

def configure(self):
if self.options.shared:
Expand Down Expand Up @@ -392,7 +395,7 @@ def _configure_cmake(self):

build_only = ["core"]
for sdk in self._sdks:
if getattr(self.options, sdk):
if self.options.get_safe(sdk):
build_only.append(sdk)
self._cmake.definitions["BUILD_ONLY"] = ";".join(build_only)

Expand Down Expand Up @@ -451,7 +454,7 @@ def package_info(self):
self.cpp_info.components["core"].requires.append("aws-c-event-stream::aws-c-event-stream-lib")

# other components
enabled_sdks = [sdk for sdk in self._sdks if getattr(self.options, sdk)]
enabled_sdks = [sdk for sdk in self._sdks if self.options.get_safe(sdk)]
for hl_comp in self._internal_requirements.keys():
if getattr(self.options, hl_comp):
for internal_requirement in self._internal_requirements[hl_comp]:
Expand Down