diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 17:53:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-04 13:06:42 (GMT) |
| commit | d65e01235da2473e669d6e5c40988ad4015f0dc4 (patch) | |
| tree | 234c423ba4437f88222358e1df38a228cb70f766 /Source | |
| parent | f059ed165bafff94f9bcd3823e12a8ce1f5ec647 (diff) | |
| download | CMake-d65e01235da2473e669d6e5c40988ad4015f0dc4.zip CMake-d65e01235da2473e669d6e5c40988ad4015f0dc4.tar.gz CMake-d65e01235da2473e669d6e5c40988ad4015f0dc4.tar.bz2 | |
cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 14 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 05e80d7..4079ccf 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1604,17 +1604,17 @@ void cmMakefile::Configure() std::vector<cmLocalGenerator*>::iterator sdi = subdirs.begin(); for (; sdi != subdirs.end(); ++sdi) { - this->ConfigureSubDirectory(*sdi); + this->ConfigureSubDirectory((*sdi)->GetMakefile()); } this->AddCMakeDependFilesFromUser(); this->SetConfigured(); } -void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) +void cmMakefile::ConfigureSubDirectory(cmMakefile *mf) { - lg2->GetMakefile()->InitializeFromParent(); - std::string currentStart = lg2->GetMakefile()->GetCurrentSourceDirectory(); + mf->InitializeFromParent(); + std::string currentStart = mf->GetCurrentSourceDirectory(); if (this->GetCMakeInstance()->GetDebugOutput()) { std::string msg=" Entering "; @@ -1652,11 +1652,11 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) // NEW behavior prints the error. this->IssueMessage(cmake::FATAL_ERROR, e.str()); } - lg2->GetMakefile()->SetConfigured(); + mf->SetConfigured(); return; } // finally configure the subdir - lg2->GetMakefile()->Configure(); + mf->Configure(); if (this->GetCMakeInstance()->GetDebugOutput()) { @@ -1695,7 +1695,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, if (immediate) { - this->ConfigureSubDirectory(lg2); + this->ConfigureSubDirectory(lg2->GetMakefile()); } else { diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e36df36..5807707 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -275,7 +275,7 @@ public: /** * Configure a subdirectory */ - void ConfigureSubDirectory(cmLocalGenerator *); + void ConfigureSubDirectory(cmMakefile* mf); /** * Add an include directory to the build. |