mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-12 23:43:59 +03:00
Code Activity

cmMakefile: Store unconfigured cmMakefiles.

Browse Source 
Not cmLocalGenerators.
This commit is contained in:
Stephen Kelly authored and Brad King committed 2015-06-04 09:06:42 -04:00
1 parent d65e01235d
commit 4e8f242d17
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/cmMakefile.cxx
+4 -4
View File
@@ -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());
}
}
Source/cmMakefile.h
+1 -1
View File
@@ -922,7 +922,7 @@ private:
mutable cmsys::RegularExpression cmAtVarRegex;
mutable cmsys::RegularExpression cmNamedCurly;
std::vector<cmLocalGenerator*> UnConfiguredDirectories;
std::vector<cmMakefile*> UnConfiguredDirectories;
cmPropertyMap Properties;