Commit dd7e4275 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Move the lexical scope.

parent 92cecd93
...@@ -645,6 +645,8 @@ bool cmMakefile::ReadListFile(const char* filename) ...@@ -645,6 +645,8 @@ bool cmMakefile::ReadListFile(const char* filename)
void cmMakefile::ReadListFile(cmListFile const& listFile, void cmMakefile::ReadListFile(cmListFile const& listFile,
std::string const& filenametoread) std::string const& filenametoread)
{ {
LexicalPushPop lexScope(this);
// add this list file to the list of dependencies // add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread); this->ListFiles.push_back(filenametoread);
...@@ -661,9 +663,6 @@ void cmMakefile::ReadListFile(cmListFile const& listFile, ...@@ -661,9 +663,6 @@ void cmMakefile::ReadListFile(cmListFile const& 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");
// Enforce balanced blocks (if/endif, function/endfunction, etc.).
LexicalPushPop lexScope(this);
// Run the parsed commands. // Run the parsed commands.
const size_t numberFunctions = listFile.Functions.size(); const size_t numberFunctions = listFile.Functions.size();
for(size_t i =0; i < numberFunctions; ++i) for(size_t i =0; i < numberFunctions; ++i)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment