diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-16 13:46:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-16 13:46:47 (GMT) |
| commit | 84c0fdb192ccdad66dc00064b6113d7a1e63944a (patch) | |
| tree | 2998f5534a3393567726716741d43c1b12f82e82 /Source/cmMakefile.cxx | |
| parent | 2701b519b17dc59b81bbf573095bfeb6fc03f326 (diff) | |
| parent | 5bbcf758a1a0c52836d313156788a10a232f1f9f (diff) | |
| download | CMake-84c0fdb192ccdad66dc00064b6113d7a1e63944a.zip CMake-84c0fdb192ccdad66dc00064b6113d7a1e63944a.tar.gz CMake-84c0fdb192ccdad66dc00064b6113d7a1e63944a.tar.bz2 | |
Merge topic 'clean-up-cmMakefile-IssueMessage'
5bbcf758 cmIfCommand: Don't rely on NestedError logic to issue messages
262ce91e cmMakefile: Extract invoke result variables
Diffstat (limited to 'Source/cmMakefile.cxx')
| -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 95ca0e2..75d57b5 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()); } |