VS: Prefer ARM64 MSBuild on Windows ARM64 host

Fixes: #23629
This commit is contained in:
Tommy Vercetti
2022-06-17 14:44:59 -05:00
committed by Brad King
parent 2787427306
commit 80273514aa

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;