mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 05:11:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'use-arm64-msbuild'

Browse Source 
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7381
This commit is contained in:
Brad King
2022-06-22 12:48:17 +00:00
committed by Kitware Robot
parent a4df9babbb 80273514aa
commit 07a0c0a12b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -899,6 +899,14 @@ std::string cmGlobalVisualStudioVersionedGenerator::FindMSBuildCommand()
std::string vs;
if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) {
if (this->Version >= cmGlobalVisualStudioGenerator::VSVersion::VS17) {
#if defined(_M_ARM64)
std::string msbuild_arm64 =
vs + "/MSBuild/Current/Bin/arm64/MSBuild.exe";
if (cmSystemTools::FileExists(msbuild_arm64)) {
return msbuild_arm64;
}
#endif
msbuild = vs + "/MSBuild/Current/Bin/amd64/MSBuild.exe";
if (cmSystemTools::FileExists(msbuild)) {
return msbuild;