diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-12 17:01:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-12 17:01:57 (GMT) |
| commit | 1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f (patch) | |
| tree | 1cab4881bbaf77866194957bb9f84c08581a1591 | |
| parent | 225675b1a27981584251b8e8c97c0f52a20173c0 (diff) | |
| parent | f3cedf381ec2cdeeeb01eb991d731e35978b4d24 (diff) | |
| download | CMake-1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f.zip CMake-1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f.tar.gz CMake-1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f.tar.bz2 | |
Merge branch 'revert-vs-msbuild-arch' into release-3.14
Merge-request: !3090
| -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; |