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

cmMakefile: Move the lexical scope.

Browse Source
This commit is contained in:
Stephen Kelly 2015-06-21 22:50:52 +02:00
parent 92cecd9369
commit dd7e42758d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefile.cxx
View File

@ -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,
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)