diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-01-28 21:10:28 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-06-13 18:20:44 (GMT) |
| commit | 262ce91e8ac3c6fc9b09605e652028db7229b9b8 (patch) | |
| tree | dbab037bc94e4bbd53d471af64e29169ca678b5b /Source | |
| parent | 8d80c8961fce8f4b38f412de664f773c213a69b8 (diff) | |
| download | CMake-262ce91e8ac3c6fc9b09605e652028db7229b9b8.zip CMake-262ce91e8ac3c6fc9b09605e652028db7229b9b8.tar.gz CMake-262ce91e8ac3c6fc9b09605e652028db7229b9b8.tar.bz2 | |
cmMakefile: Extract invoke result variables
Make it more clear what is happening here.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c9192fd..bfcd7db 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -254,9 +254,10 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, this->PrintCommandTrace(lff); } // Try invoking the command. - if (!pcmd->InvokeInitialPass(lff.Arguments, status) || - status.GetNestedError()) { - if (!status.GetNestedError()) { + bool invokeSucceeded = pcmd->InvokeInitialPass(lff.Arguments, status); + bool hadNestedError = status.GetNestedError(); + if (!invokeSucceeded || hadNestedError) { + if (!hadNestedError) { // The command invocation requested that we report an error. this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError()); } |