diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-28 18:31:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-29 14:09:18 (GMT) |
| commit | 147d36ce93d563df4ce1899facbb256e6bc9bbb2 (patch) | |
| tree | 826e4c48306d2ec139d77308c1671c21fa849421 /Source/cmGlobalGenerator.cxx | |
| parent | fa7077e7411f4f85724deae3427acb29be729567 (diff) | |
| download | CMake-147d36ce93d563df4ce1899facbb256e6bc9bbb2.zip CMake-147d36ce93d563df4ce1899facbb256e6bc9bbb2.tar.gz CMake-147d36ce93d563df4ce1899facbb256e6bc9bbb2.tar.bz2 | |
Find native build tool after selecting a toolset
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.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 04af013..ccf7c73 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -568,11 +568,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)) { @@ -593,6 +588,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 |