summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-21 20:50:52 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-30 21:14:18 (GMT)
commitdd7e42758d4874c087bbbc6ae062f36455f6d49c (patch)
tree4a95426a595e6d95ead5048c8e86a20d22b2e114
parent92cecd936999f9a4c67332d1aeaba3ff120fbbc2 (diff)
downloadCMake-dd7e42758d4874c087bbbc6ae062f36455f6d49c.zip
CMake-dd7e42758d4874c087bbbc6ae062f36455f6d49c.tar.gz
CMake-dd7e42758d4874c087bbbc6ae062f36455f6d49c.tar.bz2
cmMakefile: Move the lexical scope.
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a10f99c..9948ac8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -645,6 +645,8 @@ bool cmMakefile::ReadListFile(const char* filename)
void cmMakefile::ReadListFile(cmListFile const& listFile,
std::string const& filenametoread)
{
+ LexicalPushPop lexScope(this);
+
// add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread);
@@ -661,9 +663,6 @@ void cmMakefile::ReadListFile(cmListFile const& listFile,
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
- // Enforce balanced blocks (if/endif, function/endfunction, etc.).
- LexicalPushPop lexScope(this);
-
// Run the parsed commands.
const size_t numberFunctions = listFile.Functions.size();
for(size_t i =0; i < numberFunctions; ++i)