Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MSBuildDeps: map armv8 to ARM64 platform (#11504) #11505

Merged
merged 7 commits into from Jun 28, 2022
Merged

MSBuildDeps: map armv8 to ARM64 platform (#11504) #11505

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
49938b9
fix: x86 msbuild platform is Win32, not x86
Jun 23, 2022
37aa6ad
MSBuildDeps: map armv7 and armv8 msbuild platforms
Jun 21, 2022
a19d8f7
Merge branch 'develop' into feature/msbuild-armv8
memsharded Jun 23, 2022
f35ab05
fixed MSBuildDeps Win32 usage
memsharded Jun 23, 2022
b937726
Merge branch 'develop' into feature/msbuild-armv8
memsharded Jun 27, 2022
fd48992
test: msbuilddeps mapping of arch to platform
Jun 27, 2022
4687294
fixup: remove incorrect test description
Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conan/tools/microsoft/msbuild.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ def msbuild_verbosity_cmd_line_arg(conanfile):


def msbuild_arch(arch):
return {'x86': 'x86',
return {'x86': 'Win32',
markferry marked this conversation as resolved.
Show resolved Hide resolved
'x86_64': 'x64',
'armv7': 'ARM',
'armv8': 'ARM64'}.get(str(arch))
Expand Down
4 changes: 2 additions & 2 deletions conan/tools/microsoft/msbuilddeps.py
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
from jinja2 import Template

from conan.tools._check_build_profile import check_using_build_profile
from conan.tools.microsoft.msbuild import msbuild_arch
from conans.errors import ConanException
from conans.util.files import load, save

Expand Down Expand Up @@ -105,8 +106,7 @@ class MSBuildDeps(object):
def __init__(self, conanfile):
self._conanfile = conanfile
self.configuration = conanfile.settings.build_type
self.platform = {'x86': 'Win32',
'x86_64': 'x64'}.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