Commit 4e8f242d authored by Stephen Kelly's avatar Stephen Kelly Committed by Brad King
Browse files

cmMakefile: Store unconfigured cmMakefiles.

Not cmLocalGenerators.
parent d65e0123
......@@ -1598,13 +1598,13 @@ void cmMakefile::Configure()
this->ProcessBuildsystemFile(currentStart.c_str());
// at the end handle any old style subdirs
std::vector<cmLocalGenerator*> subdirs = this->UnConfiguredDirectories;
std::vector<cmMakefile*> subdirs = this->UnConfiguredDirectories;
// for each subdir recurse
std::vector<cmLocalGenerator*>::iterator sdi = subdirs.begin();
std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
for (; sdi != subdirs.end(); ++sdi)
{
this->ConfigureSubDirectory((*sdi)->GetMakefile());
this->ConfigureSubDirectory(*sdi);
}
this->AddCMakeDependFilesFromUser();
......@@ -1699,7 +1699,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
}
else
{
this->UnConfiguredDirectories.push_back(lg2);
this->UnConfiguredDirectories.push_back(lg2->GetMakefile());
}
}
......
......@@ -922,7 +922,7 @@ private:
mutable cmsys::RegularExpression cmAtVarRegex;
mutable cmsys::RegularExpression cmNamedCurly;
std::vector<cmLocalGenerator*> UnConfiguredDirectories;
std::vector<cmMakefile*> UnConfiguredDirectories;
cmPropertyMap Properties;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment