Commit d685a46f authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'vs-msbuild-arch'

da402a08 VS: Use MSBuild matching toolset host architecture
147d36ce

 Find native build tool after selecting a toolset
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !2876
parents d3662966 da402a08
......@@ -567,11 +567,6 @@ void cmGlobalGenerator::EnableLanguage(
return;
}
// Find the native build tool for this generator.
if (!this->FindMakeProgram(mf)) {
return;
}
// Tell the generator about the target system.
std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
if (!this->SetSystemName(system, mf)) {
......@@ -592,6 +587,11 @@ void cmGlobalGenerator::EnableLanguage(
cmSystemTools::SetFatalErrorOccured();
return;
}
// Find the native build tool for this generator.
if (!this->FindMakeProgram(mf)) {
return;
}
}
// Check that the languages are supported by the generator and its
......
......@@ -471,6 +471,18 @@ 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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment