diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-30 13:12:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-30 13:13:04 (GMT) |
| commit | d685a46f56b6f7ccf5763b87611bf383e3aa8cb7 (patch) | |
| tree | 766cace785bf9c58551a8c52e612618f50eef0bd /Source/cmGlobalGenerator.cxx | |
| parent | d36629661197b4255da2a1864ce7ec016b415d24 (diff) | |
| parent | da402a081b6575b4813e5e8798105317b451ac1e (diff) | |
| download | CMake-d685a46f56b6f7ccf5763b87611bf383e3aa8cb7.zip CMake-d685a46f56b6f7ccf5763b87611bf383e3aa8cb7.tar.gz CMake-d685a46f56b6f7ccf5763b87611bf383e3aa8cb7.tar.bz2 | |
Merge topic 'vs-msbuild-arch'
da402a081b VS: Use MSBuild matching toolset host architecture
147d36ce93 Find native build tool after selecting a toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2876
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 2b5c98f..386a3f7 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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 |