diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-22 12:48:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-22 12:48:32 (GMT) |
| commit | dc67ae7cd3e1dde8edbad9fb220b0492b0151fba (patch) | |
| tree | 5ebbb72997f83e9079a3f9ca19ac65986a95f9b6 /Source | |
| parent | 0b86798a53de6615077e0e7c186c5878f33914f8 (diff) | |
| parent | 80273514aa57003243e864567351727467c667c1 (diff) | |
| download | CMake-dc67ae7cd3e1dde8edbad9fb220b0492b0151fba.zip CMake-dc67ae7cd3e1dde8edbad9fb220b0492b0151fba.tar.gz CMake-dc67ae7cd3e1dde8edbad9fb220b0492b0151fba.tar.bz2 | |
Merge topic 'use-arm64-msbuild' into release-3.24
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7381
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index fb76f7a..b72fc4e 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -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; |