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

cmMakefile: Move resource management into the IncludeScope.

Browse Source
This commit is contained in:
Stephen Kelly 2015-06-21 19:56:31 +02:00
parent 826b6e6818
commit 254be613b8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefile.cxx
View File

@ -486,6 +486,7 @@ cmMakefile::IncludeScope::~IncludeScope()
this->EnforceCMP0011(); this->EnforceCMP0011();
} }
} }
this->Makefile->ListFileStack.pop_back();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -544,16 +545,12 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->AddDefinition("CMAKE_PARENT_LIST_FILE",
this->GetDefinition("CMAKE_CURRENT_LIST_FILE")); this->GetDefinition("CMAKE_CURRENT_LIST_FILE"));
bool result = false;
{
IncludeScope incScope(this, noPolicyScope); IncludeScope incScope(this, noPolicyScope);
result = this->ReadListFile(listfile, false); bool result = this->ReadListFile(listfile, false);
if(cmSystemTools::GetFatalErrorOccured()) if(cmSystemTools::GetFatalErrorOccured())
{ {
incScope.Quiet(); incScope.Quiet();
} }
}
this->ListFileStack.pop_back();
return result; return result;
} }