diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-13 18:31:17 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-24 07:39:38 (GMT) |
| commit | 8a88089bbef4d72aa2c448877637c5ab34f6907c (patch) | |
| tree | bce1ed080e006a978ec53ecf3417ac24eab53b41 | |
| parent | 934aa454d0029c0cba26c7f971bdb76a1d789dc2 (diff) | |
| download | CMake-8a88089bbef4d72aa2c448877637c5ab34f6907c.zip CMake-8a88089bbef4d72aa2c448877637c5ab34f6907c.tar.gz CMake-8a88089bbef4d72aa2c448877637c5ab34f6907c.tar.bz2 | |
cmMakefile: Create the local generator after configuring the makefile.
The local generator is not used during configure time.
| -rw-r--r-- | Source/cmMakefile.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8a3d197..720a5e4 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1756,11 +1756,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot); this->GetGlobalGenerator()->AddMakefile(subMf); - // create a new local generator and set its parent - cmLocalGenerator *lg2 = this->GetGlobalGenerator() - ->CreateLocalGenerator(subMf); - this->GetGlobalGenerator()->AddLocalGenerator(lg2); - // set the subdirs start dirs subMf->SetCurrentSourceDirectory(srcPath); subMf->SetCurrentBinaryDirectory(binPath); @@ -1777,6 +1772,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, { this->UnConfiguredDirectories.push_back(subMf); } + + // create a new local generator and set its parent + cmLocalGenerator *lg2 = this->GetGlobalGenerator() + ->CreateLocalGenerator(subMf); + this->GetGlobalGenerator()->AddLocalGenerator(lg2); } void cmMakefile::SetCurrentSourceDirectory(const std::string& dir) |