diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-09-24 07:35:55 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-09-24 07:39:38 (GMT) |
commit | 934aa454d0029c0cba26c7f971bdb76a1d789dc2 (patch) | |
tree | 4a77cec31d46bed4b203a2c24565c6a2afbaa222 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | 61b48e70bc8d9add8b056030ebef97ffdb92512b (diff) | |
download | CMake-934aa454d0029c0cba26c7f971bdb76a1d789dc2.zip CMake-934aa454d0029c0cba26c7f971bdb76a1d789dc2.tar.gz CMake-934aa454d0029c0cba26c7f971bdb76a1d789dc2.tar.bz2 |
Makefiles: Remove need to create local generator at configure time.
This method is used during try_compile.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 1adc379..0064713 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -578,23 +578,18 @@ void cmGlobalUnixMakefileGenerator3 if (!targetName.empty()) { cmMakefile* mf; - cmLocalUnixMakefileGenerator3 *lg; - if (!this->LocalGenerators.empty()) + if (!this->Makefiles.empty()) { - lg = static_cast<cmLocalUnixMakefileGenerator3 *> - (this->LocalGenerators[0]); - mf = lg->GetMakefile(); + mf = this->Makefiles[0]; } else { cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); mf = new cmMakefile(this, snapshot); - lg = static_cast<cmLocalUnixMakefileGenerator3 *> - (this->CreateLocalGenerator(mf)); // set the Start directories - lg->GetMakefile()->SetCurrentSourceDirectory + mf->SetCurrentSourceDirectory (this->CMakeInstance->GetHomeDirectory()); - lg->GetMakefile()->SetCurrentBinaryDirectory + mf->SetCurrentBinaryDirectory (this->CMakeInstance->GetHomeOutputDirectory()); } @@ -607,9 +602,8 @@ void cmGlobalUnixMakefileGenerator3 tname = conv.Convert(tname,cmOutputConverter::HOME_OUTPUT); cmSystemTools::ConvertToOutputSlashes(tname); makeCommand.push_back(tname); - if (this->LocalGenerators.empty()) + if (this->Makefiles.empty()) { - delete lg; delete mf; } } |