Skip to content

Commit

Permalink
MSBuildDeps: map armv7 to ARM platform (#11504)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Ferry committed Jun 22, 2022
1 parent 24558f8 commit e90c2e3
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions conan/tools/microsoft/msbuilddeps.py
Expand Up @@ -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("""\
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit e90c2e3

Please sign in to comment.