mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'defer-native-tool'

Browse Source 
f8cb9944 Find native build tool after determining the target system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1317
This commit is contained in:
Brad King
2017-09-29 12:57:36 +00:00
committed by Kitware Robot
parent 7b7c9f7c20 f8cb9944a1
commit e182ba735e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmGlobalGenerator.cxx
View File

@@ -447,15 +447,6 @@ void cmGlobalGenerator::EnableLanguage(
"Platform information initialized", cmStateEnums::INTERNAL);
}
// find and make sure CMAKE_MAKE_PROGRAM is defined
if (!this->FindMakeProgram(mf)) {
return;
}
if (!this->CheckLanguages(languages, mf)) {
return;
}
// try and load the CMakeSystem.cmake if it is there
std::string fpath = rootBin;
bool const readCMakeSystem = !mf->GetDefinition("CMAKE_SYSTEM_LOADED");
@@ -500,6 +491,11 @@ void cmGlobalGenerator::EnableLanguage(
}
if (readCMakeSystem) {
// 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)) {
@@ -522,6 +518,12 @@ void cmGlobalGenerator::EnableLanguage(
}
}
// Check that the languages are supported by the generator and its
// native build tool found above.
if (!this->CheckLanguages(languages, mf)) {
return;
}
// **** Load the system specific initialization if not yet loaded
if (!mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INITIALIZE_LOADED")) {
fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake");