summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-21 17:42:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-21 18:10:47 (GMT)
commitfff3c6cd1c49ba1aa8a256e26294db65710c9d18 (patch)
tree5a7e072555b306fba71564cd487c92cf9b7987b6 /Source
parenta6e661b848fc180b03e7d72739c9a4a077a97e3f (diff)
downloadCMake-fff3c6cd1c49ba1aa8a256e26294db65710c9d18.zip
CMake-fff3c6cd1c49ba1aa8a256e26294db65710c9d18.tar.gz
CMake-fff3c6cd1c49ba1aa8a256e26294db65710c9d18.tar.bz2
cmMakefile: Move a container population.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 08c5a0b..3c32362 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -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;
}
}
- }
}
//----------------------------------------------------------------------------