diff options
| -rw-r--r-- | Source/cmMakefile.cxx | 8 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4079ccf..ae9fe32 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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()); } } diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5807707..4174f44 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -922,7 +922,7 @@ private: mutable cmsys::RegularExpression cmAtVarRegex; mutable cmsys::RegularExpression cmNamedCurly; - std::vector<cmLocalGenerator*> UnConfiguredDirectories; + std::vector<cmMakefile*> UnConfiguredDirectories; cmPropertyMap Properties; |