From e90c2e3728fb4a9af89b5841c76b6e2af6b20333 Mon Sep 17 00:00:00 2001 From: Mark Ferry Date: Wed, 22 Jun 2022 15:49:27 +0100 Subject: [PATCH] MSBuildDeps: map armv7 to ARM platform (#11504) --- conan/tools/microsoft/msbuilddeps.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conan/tools/microsoft/msbuilddeps.py b/conan/tools/microsoft/msbuilddeps.py index 183bf0e36e9..27ef2a2628b 100644 --- a/conan/tools/microsoft/msbuilddeps.py +++ b/conan/tools/microsoft/msbuilddeps.py @@ -12,6 +12,13 @@ VALID_LIB_EXTENSIONS = (".so", ".lib", ".a", ".dylib", ".bc") +def msbuild_arch(arch): + return {'x86': 'x86', + 'x86_64': 'x64', + 'armv7': 'ARM', + 'armv8': 'ARM64'}.get(str(arch)) + + class MSBuildDeps(object): _vars_props = textwrap.dedent("""\ @@ -105,10 +112,7 @@ class MSBuildDeps(object): def __init__(self, conanfile): self._conanfile = conanfile self.configuration = conanfile.settings.build_type - self.platform = {'x86': 'Win32', - 'x86_64': 'x64', - 'armv8': 'ARM64', - }.get(str(conanfile.settings.arch)) + self.platform = msbuild_arch(conanfile.settings.arch) # ca_exclude section # TODO: Accept single strings, not lists self.exclude_code_analysis = self._conanfile.conf.get("tools.microsoft.msbuilddeps:exclude_code_analysis",