diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-01-28 21:10:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-25 13:47:26 (GMT) |
| commit | 14a8d61fd49a9b990cbef7e1495e4763f31c55f2 (patch) | |
| tree | 5f680dfd5058708d30cea6442060a25c374849ff /Source/cmFunctionCommand.cxx | |
| parent | 2af853deb5225a9c8cb3d1e6311680c3fb7d86aa (diff) | |
| download | CMake-14a8d61fd49a9b990cbef7e1495e4763f31c55f2.zip CMake-14a8d61fd49a9b990cbef7e1495e4763f31c55f2.tar.gz CMake-14a8d61fd49a9b990cbef7e1495e4763f31c55f2.tar.bz2 | |
cmMakefile: Port nested error logic away from cmExecutionStatus
It is no longer needed.
Diffstat (limited to 'Source/cmFunctionCommand.cxx')
| -rw-r--r-- | Source/cmFunctionCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index 40c54db..f0e4854 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -76,7 +76,7 @@ public: }; bool cmFunctionHelperCommand::InvokeInitialPass( - const std::vector<cmListFileArgument>& args, cmExecutionStatus& inStatus) + const std::vector<cmListFileArgument>& args, cmExecutionStatus&) { // Expand the argument list to the function. std::vector<std::string> expandedArgs; @@ -129,11 +129,11 @@ bool cmFunctionHelperCommand::InvokeInitialPass( for (unsigned int c = 0; c < this->Functions.size(); ++c) { cmExecutionStatus status; if (!this->Makefile->ExecuteCommand(this->Functions[c], status) || - status.GetNestedError()) { + (cmSystemTools::GetErrorOccuredFlag() && + !cmSystemTools::GetFatalErrorOccured())) { // The error message should have already included the call stack // so we do not need to report an error here. functionScope.Quiet(); - inStatus.SetNestedError(true); return false; } if (status.GetReturnInvoked()) { |