cmMakefile: Move a container population.

This commit is contained in:
Stephen Kelly 2015-06-21 19:42:21 +02:00
parent a6e661b848
commit fff3c6cd1c
1 changed files with 3 additions and 5 deletions

View File

@ -581,6 +581,9 @@ bool cmMakefile::ReadListFile(const char* listfile,
requireProjectCommand, this);
if (res)
{
// add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread);
this->ReadListFileInternal(listFile, filenametoread.c_str(),
noPolicyScope);
}
@ -605,11 +608,7 @@ void cmMakefile::ReadListFileInternal(cmListFile const& listFile,
const char* filenametoread,
bool noPolicyScope)
{
// add this list file to the list of dependencies
this->ListFiles.push_back( filenametoread);
// Enforce balanced blocks (if/endif, function/endfunction, etc.).
{
LexicalPushPop lexScope(this);
IncludeScope incScope(this, filenametoread, noPolicyScope);
@ -632,7 +631,6 @@ void cmMakefile::ReadListFileInternal(cmListFile const& listFile,
break;
}
}
}
}
//----------------------------------------------------------------------------