This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 3e90ac3243394441001e232620e31850d1d25865 (commit) via 5bbcf758a1a0c52836d313156788a10a232f1f9f (commit) via 262ce91e8ac3c6fc9b09605e652028db7229b9b8 (commit) from ce3b106ac2c149d1d4653dc1d417b261101acdea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e90ac3243394441001e232620e31850d1d25865 commit 3e90ac3243394441001e232620e31850d1d25865 Merge: ce3b106 5bbcf75 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Jun 13 14:32:08 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jun 13 14:32:08 2016 -0400 Merge topic 'clean-up-cmMakefile-IssueMessage' into next 5bbcf758 cmIfCommand: Don't rely on NestedError logic to issue messages 262ce91e cmMakefile: Extract invoke result variables https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bbcf758a1a0c52836d313156788a10a232f1f9f commit 5bbcf758a1a0c52836d313156788a10a232f1f9f Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Jan 28 22:10:29 2016 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Jun 13 20:20:44 2016 +0200 cmIfCommand: Don't rely on NestedError logic to issue messages diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 45395d1..cb5ba76 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -185,12 +185,12 @@ bool cmIfCommand::InvokeInitialPass( conditionEvaluator.IsTrue(expandedArguments, errorString, status); if (!errorString.empty()) { - std::string err = cmIfCommandError(expandedArguments); + std::string err = "if " + cmIfCommandError(expandedArguments); err += errorString; if (status == cmake::FATAL_ERROR) { - this->SetError(err); + this->Makefile->IssueMessage(cmake::FATAL_ERROR, err); cmSystemTools::SetFatalErrorOccured(); - return false; + return true; } else { this->Makefile->IssueMessage(status, err); } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=262ce91e8ac3c6fc9b09605e652028db7229b9b8 commit 262ce91e8ac3c6fc9b09605e652028db7229b9b8 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Jan 28 22:10:28 2016 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Jun 13 20:20:44 2016 +0200 cmMakefile: Extract invoke result variables Make it more clear what is happening here. 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()); } ----------------------------------------------------------------------- Summary of changes: Source/cmIfCommand.cxx | 6 +++--- Source/cmMakefile.cxx | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits