mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-03 04:03:23 +03:00
Code Activity

VS: Prefer ARM64 MSBuild on Windows ARM64 host

Browse Source 
Fixes: #23629
This commit is contained in:
Tommy Vercetti authored and Brad King committed 2022-06-21 10:56:42 -04:00
1 parent 2787427306
commit 80273514aa
1 file changed
+8
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalVisualStudioVersionedGenerator.cxx
+8
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;