diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-09 20:27:35 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-09 21:42:13 (GMT) |
| commit | 22d09ecf33f3d07925003995b76b7e8aa788c04f (patch) | |
| tree | f73970d9a4177a48c7ba136fa3979202062546d7 | |
| parent | 821a711b6ff59fd1fa0c0cbaa43178cee1718078 (diff) | |
| download | CMake-22d09ecf33f3d07925003995b76b7e8aa788c04f.zip CMake-22d09ecf33f3d07925003995b76b7e8aa788c04f.tar.gz CMake-22d09ecf33f3d07925003995b76b7e8aa788c04f.tar.bz2 | |
cmLocalGenerator: Remove ConfigureFinalPass.
Call the cmMakefile implementation directly. This is a configure-time
construct.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index bd949bb..9b02cbb 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1540,7 +1540,7 @@ void cmGlobalGenerator::CheckLocalGenerators() cmState* state = this->GetCMakeInstance()->GetState(); for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) { - this->LocalGenerators[i]->ConfigureFinalPass(); + this->LocalGenerators[i]->GetMakefile()->ConfigureFinalPass(); cmTargets &targets = this->LocalGenerators[i]->GetMakefile()->GetTargets(); for (cmTargets::iterator l = targets.begin(); diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 5ed53d0..98accf9 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -113,11 +113,6 @@ void cmLocalGenerator::ComputeObjectMaxPath() this->ObjectMaxPathViolations.clear(); } -void cmLocalGenerator::ConfigureFinalPass() -{ - this->Makefile->ConfigureFinalPass(); -} - void cmLocalGenerator::TraceDependencies() { std::vector<std::string> configs; diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index efdd487..42df2b8 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -55,11 +55,6 @@ public: virtual void AddHelperCommands() {} /** - * Perform any final calculations prior to generation - */ - void ConfigureFinalPass(); - - /** * Generate the install rules files in this directory. */ void GenerateInstallRules(); |