summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d38acc..4fb853b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -378,20 +378,18 @@ bool cmMakefile::ReadListFile(const char* filename_in, const char *external_in)
}
}
- cmListFile* lf =
- cmListFileCache::GetInstance()->GetFileCache(filenametoread,
- requireProjectCommand);
- if(!lf)
+ cmListFile cacheFile;
+ if( !cacheFile.ParseFile(filenametoread, requireProjectCommand) )
{
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentFile.c_str());
return false;
}
// add this list file to the list of dependencies
m_ListFiles.push_back( filenametoread);
- const size_t numberFunctions = lf->m_Functions.size();
+ const size_t numberFunctions = cacheFile.m_Functions.size();
for(size_t i =0; i < numberFunctions; ++i)
{
- this->ExecuteCommand(lf->m_Functions[i]);
+ this->ExecuteCommand(cacheFile.m_Functions[i]);
if ( cmSystemTools::GetFatalErrorOccured() )
{
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentFile.c_str());