Skip to content

ARROW-17250: [CI][Conan] Enable utf8proc automatically #13744

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

Merged
kou merged 4 commits into from
Aug 1, 2022
Merged

ARROW-17250: [CI][Conan] Enable utf8proc automatically #13744

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee4aae0
ARROW-17250: [CI][Conan] Enable utf8proc automatically
kou Jul 29, 2022
ffe4429
Fix variable
kou Jul 29, 2022
00de80e
Fix a typo
kou Aug 1, 2022
9ab9f6d
Revert a needless change
kou Aug 1, 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
4 changes: 2 additions & 2 deletions ci/conan/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def _with_thrift(self, required=False):

def _with_utf8proc(self, required=False):
if required or self.options.with_utf8proc == "auto":
return False
return bool(self._compute() or self.options.gandiva)
else:
return bool(self.options.with_utf8proc)

Expand Down Expand Up @@ -549,7 +549,7 @@ def package_info(self):
if self._with_protobuf():
self.cpp_info.components["libarrow"].requires.append("protobuf::protobuf")
if self._with_utf8proc():
self.cpp_info.components["libarrow"].requires.append("uff8proc::uff8proc")
self.cpp_info.components["libarrow"].requires.append("utf8proc::utf8proc")
if self._with_thrift():
self.cpp_info.components["libarrow"].requires.append("thrift::thrift")
if self.options.with_backtrace:
Expand Down