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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmMakefile.cxx
View File

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