diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-12 16:53:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-12 16:53:06 (GMT) |
| commit | f3cedf381ec2cdeeeb01eb991d731e35978b4d24 (patch) | |
| tree | 9edf159ddaa2dd358cd17987bc71e5079ad2914d /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
| parent | f96f1aa5711118dfa410cfae0a8b83e9cc888646 (diff) | |
| download | CMake-f3cedf381ec2cdeeeb01eb991d731e35978b4d24.zip CMake-f3cedf381ec2cdeeeb01eb991d731e35978b4d24.tar.gz CMake-f3cedf381ec2cdeeeb01eb991d731e35978b4d24.tar.bz2 | |
VS: Revert "Use MSBuild matching toolset host architecture"
Revert commit da402a081b (VS: Use MSBuild matching toolset host
architecture, 2019-01-28, v3.14.0-rc1~50^2). Multiple people have
reported that the 64-bit `amd64/msbuild` tool fails in cases that the
32-bit `msbuild` works. Drop our change pending further investigation
and hopefully a fix to VS.
Fixes: #18904, #19037
Issue: #18219
Diffstat (limited to 'Source/cmGlobalVisualStudioVersionedGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
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 @@ std::string cmGlobalVisualStudioVersionedGenerator::FindMSBuildCommand() // 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; |