From e26e7a397a3e64fcff6851dbcb6863f415153727 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Mon, 23 Oct 2023 16:28:29 +0200 Subject: [PATCH 1/2] Only block msvc Signed-off-by: Uilian Ries --- recipes/wt/all/conanfile.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/wt/all/conanfile.py b/recipes/wt/all/conanfile.py index 341e5e1481c9c..1b5d019d42e4b 100644 --- a/recipes/wt/all/conanfile.py +++ b/recipes/wt/all/conanfile.py @@ -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): + + # 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') From 7d9b136f2a478e62217804fb42afb04cf6ae1a5a Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Mon, 23 Oct 2023 18:32:42 +0200 Subject: [PATCH 2/2] Update recipes/wt/all/conanfile.py --- recipes/wt/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wt/all/conanfile.py b/recipes/wt/all/conanfile.py index 1b5d019d42e4b..1e23253caacc0 100644 --- a/recipes/wt/all/conanfile.py +++ b/recipes/wt/all/conanfile.py @@ -123,7 +123,7 @@ def validate(self): ) # FIXME: https://redmine.emweb.be/issues/12073w - if conan_version.major == 2 and Version(self.version) >= "4.10.1" and is_msvc(self): + if conan_version.major == 2 and Version(self.version) == "4.10.1" and is_msvc(self): # 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