diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-13 14:08:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-13 14:08:57 (GMT) |
| commit | 1b8c5a0c35bdc8e7004a56fca356f6c917e31a15 (patch) | |
| tree | 13a6a533d56e701e11496acc307f3ae17b51cdbb /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
| parent | d7c4a8ab81182ec438a444464a9f13847080d8a6 (diff) | |
| parent | f3cedf381ec2cdeeeb01eb991d731e35978b4d24 (diff) | |
| download | CMake-1b8c5a0c35bdc8e7004a56fca356f6c917e31a15.zip CMake-1b8c5a0c35bdc8e7004a56fca356f6c917e31a15.tar.gz CMake-1b8c5a0c35bdc8e7004a56fca356f6c917e31a15.tar.bz2 | |
Merge topic 'revert-vs-msbuild-arch'
f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3090
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 94f6b68..391fe69 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; |