diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-05-13 15:08:29 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-05-13 15:08:29 (GMT) |
| commit | 0a7ec1a4b6fb822968f38e4fc147fb0dd73aaed8 (patch) | |
| tree | 018a33ee7b2a520dd56de67077a701f149ef31ce /Source | |
| parent | cecfce23a5138a0f44a9231d158c1d8541233a36 (diff) | |
| download | CMake-0a7ec1a4b6fb822968f38e4fc147fb0dd73aaed8.zip CMake-0a7ec1a4b6fb822968f38e4fc147fb0dd73aaed8.tar.gz CMake-0a7ec1a4b6fb822968f38e4fc147fb0dd73aaed8.tar.bz2 | |
BUG: fix for #9014, FATAL_ERROR not ending loops
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmForEachCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmWhileCommand.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index 7a03523..4dead90 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -72,6 +72,10 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, mf.AddDefinition(this->Args[0].c_str(),oldDef.c_str()); return true; } + if(cmSystemTools::GetFatalErrorOccured() ) + { + return true; + } } } // restore the variable to its prior value diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index cc16512..e51f253 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -60,6 +60,10 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, { return true; } + if(cmSystemTools::GetFatalErrorOccured() ) + { + return true; + } } expandedArguments.clear(); mf.ExpandArguments(this->Args, expandedArguments); |