diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-19 15:09:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-19 15:09:21 (GMT) |
| commit | aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7 (patch) | |
| tree | 1ba4368530f862529bbd4eec0b298ce28cbdb955 /Source | |
| parent | dee32a8d0baf23bfb130fbb1dc508adf8688dc32 (diff) | |
| parent | 3a65606591818281ba75bac4751e07c69751451f (diff) | |
| download | CMake-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')
| -rw-r--r-- | Source/cmFunctionCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index fdd1018..001adb1 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -94,8 +94,8 @@ bool cmFunctionHelperCommand::InvokeInitialPass } // we push a scope on the makefile - cmMakefile::LexicalPushPop lexScope(this->Makefile); cmMakefile::ScopePushPop varScope(this->Makefile); + cmMakefile::LexicalPushPop lexScope(this->Makefile); static_cast<void>(varScope); // Push a weak policy scope which restores the policies recorded at 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) |