echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Find native build tool after selecting a toolset

Browse Source 
This will allow `CMAKE_GENERATOR_TOOLSET` to influence build tool
selection.

For reference, commit f8cb9944a1 (Find native build tool after
determining the target system, 2017-09-26, v3.10.0-rc1~31^2) already
delayed this step from where it was historically.
This commit is contained in:
Brad King 2019-01-28 13:31:01 -05:00
parent fa7077e741
commit 147d36ce93
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalGenerator.cxx
View File

@ -568,11 +568,6 @@ void cmGlobalGenerator::EnableLanguage(
return; return;
} }
// Find the native build tool for this generator.
if (!this->FindMakeProgram(mf)) {
return;
}
// Tell the generator about the target system. // Tell the generator about the target system.
std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME"); std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
if (!this->SetSystemName(system, mf)) { if (!this->SetSystemName(system, mf)) {
@ -593,6 +588,11 @@ void cmGlobalGenerator::EnableLanguage(
cmSystemTools::SetFatalErrorOccured(); cmSystemTools::SetFatalErrorOccured();
return; 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 // Check that the languages are supported by the generator and its