From 666676f4249a3bd7bd734b7c0cde979d89fc2fe9 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 21 Mar 2023 23:30:02 +0100 Subject: [PATCH] build: MSVC update is not checked in `validate()` anymore --- conanfile.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/conanfile.py b/conanfile.py index 798fcb89..d1387116 100644 --- a/conanfile.py +++ b/conanfile.py @@ -74,18 +74,7 @@ class MPUnitsConan(ConanFile): @property def _minimum_compilers_version(self): - return {"gcc": "10.3", "clang": "12", "apple-clang": "13", "msvc": "1928"} - - @property - def _full_compiler_version(self): - compiler = self.settings.compiler - if compiler == "msvc": - if compiler.update: - return int(f"{compiler.version}{compiler.update}") - else: - return int(f"{compiler.version}0") - else: - return compiler.version + return {"gcc": "10.3", "clang": "12", "apple-clang": "13", "msvc": "192"} @property def _build_all(self): @@ -142,11 +131,9 @@ class MPUnitsConan(ConanFile): compiler = self.settings.compiler min_version = self._minimum_compilers_version.get(str(compiler)) - if min_version and loose_lt_semver( - str(self._full_compiler_version), min_version - ): + if min_version and loose_lt_semver(str(compiler.version), min_version): raise ConanInvalidConfiguration( - f"{self.ref} requires at least {compiler} {min_version} ({self._full_compiler_version} in use)" + f"{self.ref} requires at least {compiler} {min_version} ({compiler.version} in use)" ) def layout(self):