commit 1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f
author Brad King <brad.king@kitware.com> Tue Mar 12 13:01:57 2019 -0400
committer Brad King <brad.king@kitware.com> Tue Mar 12 13:01:57 2019 -0400
tree 1cab4881bbaf77866194957bb9f84c08581a1591
parent 225675b1a27981584251b8e8c97c0f52a20173c0
parent f3cedf381ec2cdeeeb01eb991d731e35978b4d24

Merge branch 'revert-vs-msbuild-arch' into release-3.14

Merge-request: !3090

Source/cmGlobalVisualStudioVersionedGenerator.cxx

diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 2f9eb3f..4d74e32 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -478,18 +478,6 @@
   // Ask Visual Studio Installer tool.
   std::string vs;
   if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) {
-    std::string const& hostArch =
-      this->GetPlatformToolsetHostArchitectureString();
-    if (hostArch == "x64") {
-      msbuild = vs + "/MSBuild/Current/Bin/amd64/MSBuild.exe";
-      if (cmSystemTools::FileExists(msbuild)) {
-        return msbuild;
-      }
-      msbuild = vs + "/MSBuild/15.0/Bin/amd64/MSBuild.exe";
-      if (cmSystemTools::FileExists(msbuild)) {
-        return msbuild;
-      }
-    }
     msbuild = vs + "/MSBuild/Current/Bin/MSBuild.exe";
     if (cmSystemTools::FileExists(msbuild)) {
       return msbuild;