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

cmMakefile: Split file handling from execution.

This commit is contained in:
Stephen Kelly 2015-06-21 19:43:55 +02:00
parent d5aaa2b96f
commit 5e24ff17a2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmMakefile.cxx
View File

@ -561,6 +561,17 @@ bool cmMakefile::ReadListFile(const char* listfile,
cmSystemTools::CollapseFullPath(listfile, cmSystemTools::CollapseFullPath(listfile,
this->GetCurrentSourceDirectory()); this->GetCurrentSourceDirectory());
this->ListFileStack.push_back(filenametoread);
cmListFile listFile;
bool res = listFile.ParseFile(filenametoread.c_str(),
requireProjectCommand, this);
if (res)
{
// add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread);
}
std::string currentParentFile std::string currentParentFile
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE"); = this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");
std::string currentFile std::string currentFile
@ -574,16 +585,8 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
this->ListFileStack.push_back(filenametoread);
cmListFile listFile;
bool res = listFile.ParseFile(filenametoread.c_str(),
requireProjectCommand, this);
if (res) if (res)
{ {
// add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread);
this->ReadListFileInternal(listFile, filenametoread.c_str(), this->ReadListFileInternal(listFile, filenametoread.c_str(),
noPolicyScope); noPolicyScope);