From 63ce451805f21bef80bfbf9a8b8d2c6ff242d9f6 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:07:33 +0000 Subject: [PATCH] (#14626) [googleapis] Use is_msvc to abstract away compiler name setting --- recipes/googleapis/all/conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/googleapis/all/conanfile.py b/recipes/googleapis/all/conanfile.py index 0a81aae16d..022bfade00 100644 --- a/recipes/googleapis/all/conanfile.py +++ b/recipes/googleapis/all/conanfile.py @@ -7,12 +7,14 @@ from conans import CMake, tools from conan import ConanFile from conan.tools.files import get, copy +from conan.tools.microsoft import is_msvc from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration from helpers import parse_proto_libraries +required_conan_version = ">=1.45.0" class GoogleAPIS(ConanFile): name = "googleapis" @@ -55,7 +57,7 @@ class GoogleAPIS(ConanFile): if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) <= "5": raise ConanInvalidConfiguration("Build with GCC 5 fails") - if self.settings.compiler in ["Visual Studio", "msvc"] and self.options.shared: + if is_msvc(self) and self.options.shared: raise ConanInvalidConfiguration("Source code generated from protos is missing some export macro") if self.options.shared and not self.options["protobuf"].shared: raise ConanInvalidConfiguration("If built as shared, protobuf must be shared as well. Please, use `protobuf:shared=True`")