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

cmMakefile: Move IncludeScope instance.

parent b7166afa
...@@ -558,6 +558,8 @@ bool cmMakefile::ReadListFile(const char* listfile, ...@@ -558,6 +558,8 @@ bool cmMakefile::ReadListFile(const char* listfile,
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand) bool requireProjectCommand)
{ {
IncludeScope incScope(this, noPolicyScope);
std::string filenametoread = std::string filenametoread =
cmSystemTools::CollapseFullPath(listfile, cmSystemTools::CollapseFullPath(listfile,
this->GetCurrentSourceDirectory()); this->GetCurrentSourceDirectory());
...@@ -587,7 +589,6 @@ bool cmMakefile::ReadListFile(const char* listfile, ...@@ -587,7 +589,6 @@ bool cmMakefile::ReadListFile(const char* 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");
IncludeScope incScope(this, noPolicyScope);
this->ReadListFileInternal(listFile); this->ReadListFileInternal(listFile);
if(cmSystemTools::GetFatalErrorOccured()) if(cmSystemTools::GetFatalErrorOccured())
{ {
......
Supports Markdown
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