kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Store unconfigured cmMakefiles. 

Not cmLocalGenerators.
This commit is contained in:
Stephen Kelly 2015-06-03 00:55:00 +02:00 committed by Brad King
parent d65e01235d
commit 4e8f242d17
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmMakefile.cxx
View File

@ -1598,13 +1598,13 @@ void cmMakefile::Configure()
this->ProcessBuildsystemFile(currentStart.c_str()); this->ProcessBuildsystemFile(currentStart.c_str());
// at the end handle any old style subdirs // at the end handle any old style subdirs
std::vector<cmLocalGenerator*> subdirs = this->UnConfiguredDirectories; std::vector<cmMakefile*> subdirs = this->UnConfiguredDirectories;
// for each subdir recurse // for each subdir recurse
std::vector<cmLocalGenerator*>::iterator sdi = subdirs.begin(); std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
for (; sdi != subdirs.end(); ++sdi) for (; sdi != subdirs.end(); ++sdi)
{ {
this->ConfigureSubDirectory((*sdi)->GetMakefile()); this->ConfigureSubDirectory(*sdi);
} }
this->AddCMakeDependFilesFromUser(); this->AddCMakeDependFilesFromUser();
@ -1699,7 +1699,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
} }
else else
{ {
this->UnConfiguredDirectories.push_back(lg2); this->UnConfiguredDirectories.push_back(lg2->GetMakefile());
} }
} }

2
Source/cmMakefile.h
View File

@ -922,7 +922,7 @@ private:
mutable cmsys::RegularExpression cmAtVarRegex; mutable cmsys::RegularExpression cmAtVarRegex;
mutable cmsys::RegularExpression cmNamedCurly; mutable cmsys::RegularExpression cmNamedCurly;
std::vector<cmLocalGenerator*> UnConfiguredDirectories; std::vector<cmMakefile*> UnConfiguredDirectories;
cmPropertyMap Properties; cmPropertyMap Properties;