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

cmMakefile: Extract invoke result variables 

Make it more clear what is happening here.
This commit is contained in:
Stephen Kelly 2016-01-28 22:10:28 +01:00
parent 8d80c8961f
commit 262ce91e8a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefile.cxx
View File

@ -254,9 +254,10 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
this->PrintCommandTrace(lff); this->PrintCommandTrace(lff);
} }
// Try invoking the command. // Try invoking the command.
if (!pcmd->InvokeInitialPass(lff.Arguments, status) || bool invokeSucceeded = pcmd->InvokeInitialPass(lff.Arguments, status);
status.GetNestedError()) { bool hadNestedError = status.GetNestedError();
if (!status.GetNestedError()) { if (!invokeSucceeded || hadNestedError) {
if (!hadNestedError) {
// The command invocation requested that we report an error. // The command invocation requested that we report an error.
this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError()); this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
} }