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

[wt] Unblock Linux and Mac for 4.10.1 + cppstd=17 #20751

Merged
merged 2 commits into from
Oct 25, 2023
Merged

[wt] Unblock Linux and Mac for 4.10.1 + cppstd=17 #20751

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e26e7a3
Only block msvc
uilianries Oct 23, 2023
7d9b136
Update recipes/wt/all/conanfile.py
uilianries Oct 23, 2023
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/wt/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,11 @@ def validate(self):
f"{self.ref} requires non header-only boost with these components: "
f"{', '.join(self._required_boost_components)}"
)
# FIXME: check_max_cppstd is only available for Conan 2.x. Remove it after dropping support for Conan 1.x
if conan_version.major == 2 and Version(self.version) >= "4.10.1":

# FIXME: https://redmine.emweb.be/issues/12073w
if conan_version.major == 2 and Version(self.version) >= "4.10.1" and is_msvc(self):
uilianries marked this conversation as resolved.
Show resolved Hide resolved

# FIXME: check_max_cppstd is only available for Conan 2.x. Remove it after dropping support for Conan 1.x
# FIXME: linter complains, but function is there
# https://docs.conan.io/2.0/reference/tools/build.html?highlight=check_min_cppstd#conan-tools-build-check-max-cppstd
check_max_cppstd = getattr(sys.modules['conan.tools.build'], 'check_max_cppstd')
Expand Down