kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Move listfile parsing responsibility.

This commit is contained in:
Stephen Kelly 2015-06-21 19:30:23 +02:00
parent 155ef53597
commit ac10fc0958
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmMakefile.cxx
View File

@ -576,8 +576,14 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->ListFileStack.push_back(filenametoread); this->ListFileStack.push_back(filenametoread);
bool res = this->ReadListFileInternal(filenametoread.c_str(), cmListFile cacheFile;
noPolicyScope, requireProjectCommand); bool res = cacheFile.ParseFile(filenametoread.c_str(),
requireProjectCommand, this);
if (res)
{
this->ReadListFileInternal(cacheFile, filenametoread.c_str(),
noPolicyScope);
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str()); this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str()); this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
@ -595,15 +601,10 @@ bool cmMakefile::ReadListFile(const char* listfile,
return res; return res;
} }
bool cmMakefile::ReadListFileInternal(const char* filenametoread, bool cmMakefile::ReadListFileInternal(cmListFile const& cacheFile,
bool noPolicyScope, const char* filenametoread,
bool requireProjectCommand) bool noPolicyScope)
{ {
cmListFile cacheFile;
if( !cacheFile.ParseFile(filenametoread, requireProjectCommand, this) )
{
return false;
}
// add this list file to the list of dependencies // add this list file to the list of dependencies
this->ListFiles.push_back( filenametoread); this->ListFiles.push_back( filenametoread);

6
Source/cmMakefile.h
View File

@ -918,9 +918,9 @@ private:
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand); bool requireProjectCommand);
bool ReadListFileInternal(const char* filenametoread, bool ReadListFileInternal(cmListFile const& cacheFile,
bool noPolicyScope, const char* filenametoread,
bool requireProjectCommand); bool noPolicyScope);
bool ParseDefineFlag(std::string const& definition, bool remove); bool ParseDefineFlag(std::string const& definition, bool remove);