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

cmMakefile: Inline PushScope into PushFunctionScope. 

Make it possible to group the various methods here a different way.
This commit is contained in:
Stephen Kelly 2015-05-31 23:45:52 +02:00
parent ca140c2e89
commit db74ce5820
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmMakefile.cxx
View File

@ -1564,7 +1564,13 @@ void cmMakefile::InitializeFromParent()
void cmMakefile::PushFunctionScope(const cmPolicies::PolicyMap& pm) void cmMakefile::PushFunctionScope(const cmPolicies::PolicyMap& pm)
{ {
this->PushScope(); this->Internal->PushDefinitions();
this->PushLoopBlockBarrier();
#if defined(CMAKE_BUILD_WITH_CMAKE)
this->GetGlobalGenerator()->GetFileLockPool().PushFunctionScope();
#endif
this->PushFunctionBlockerBarrier(); this->PushFunctionBlockerBarrier();
@ -1579,7 +1585,15 @@ void cmMakefile::PopFunctionScope(bool reportError)
this->PopFunctionBlockerBarrier(reportError); this->PopFunctionBlockerBarrier(reportError);
this->PopScope(); #if defined(CMAKE_BUILD_WITH_CMAKE)
this->GetGlobalGenerator()->GetFileLockPool().PopFunctionScope();
#endif
this->PopLoopBlockBarrier();
this->CheckForUnusedVariables();
this->Internal->PopDefinitions();
} }
void cmMakefile::PushMacroScope(const cmPolicies::PolicyMap& pm) void cmMakefile::PushMacroScope(const cmPolicies::PolicyMap& pm)