diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-07 13:49:42 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-07 13:49:42 (GMT) |
commit | 4259971961aff5e6423eb72a4fad8acf7af79653 (patch) | |
tree | 56d0a716ecbf52513f4c2f6607b4522b0cbb5280 /Source/cmMakefile.cxx | |
parent | 515757007a4af94e9c80237a83e535ac62851c5b (diff) | |
download | CMake-4259971961aff5e6423eb72a4fad8acf7af79653.zip CMake-4259971961aff5e6423eb72a4fad8acf7af79653.tar.gz CMake-4259971961aff5e6423eb72a4fad8acf7af79653.tar.bz2 |
ENH: Since list file cache does not make much sense any more (because of proper list file parsing), and it actually adds unnecessary complications and make ctest scripting not work, take it out
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 10 |
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()); |