summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-19 15:09:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-19 15:09:21 (GMT)
commitaa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7 (patch)
tree1ba4368530f862529bbd4eec0b298ce28cbdb955 /Source/cmMakefile.cxx
parentdee32a8d0baf23bfb130fbb1dc508adf8688dc32 (diff)
parent3a65606591818281ba75bac4751e07c69751451f (diff)
downloadCMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.zip
CMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.tar.gz
CMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.tar.bz2
Merge topic 'fix-function-missing-endforeach'
3a656065 Fix assertion failure on unmatched foreach in function (#15572)
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7b8d3af..620a1d6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3276,6 +3276,7 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError)
this->FunctionBlockerBarriers.back();
while(this->FunctionBlockers.size() > barrier)
{
+ cmMakefile::LoopBlockPop loopBlockPop(this);
cmsys::auto_ptr<cmFunctionBlocker> fb(this->FunctionBlockers.back());
this->FunctionBlockers.pop_back();
if(reportError)