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

BUG: fix for #9014, FATAL_ERROR not ending loops

This commit is contained in:
Bill Hoffman 2009-05-13 11:08:29 -04:00
parent cecfce23a5
commit 0a7ec1a4b6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmForEachCommand.cxx
View File

@ -72,6 +72,10 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
mf.AddDefinition(this->Args[0].c_str(),oldDef.c_str()); mf.AddDefinition(this->Args[0].c_str(),oldDef.c_str());
return true; return true;
} }
if(cmSystemTools::GetFatalErrorOccured() )
{
return true;
}
} }
} }
// restore the variable to its prior value // restore the variable to its prior value

4
Source/cmWhileCommand.cxx
View File

@ -60,6 +60,10 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
{ {
return true; return true;
} }
if(cmSystemTools::GetFatalErrorOccured() )
{
return true;
}
} }
expandedArguments.clear(); expandedArguments.clear();
mf.ExpandArguments(this->Args, expandedArguments); mf.ExpandArguments(this->Args, expandedArguments);