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 44f126ab785f881dc3582fea137f9f948e6506d8 (commit) via 52ec845fce84e327216819b7b89183dbbd452636 (commit) via 6ef858b50195ece350800de746e5c8126dfbae94 (commit) via e3aac9b8d66bb6d2287f43784c05b4a020673da5 (commit) via 80a95e185e026d77019056b59e81102df9056dea (commit) from 3642bb085688f8b4c16f6d9855fe5fd840e13a31 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44f126ab785f881dc3582fea137f9f948e6506d8 commit 44f126ab785f881dc3582fea137f9f948e6506d8 Merge: 3642bb0 52ec845 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Tue Sep 4 10:53:32 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Sep 4 10:53:32 2012 -0400 Merge topic 'cmake-gui-interrupt-error' into next 52ec845 cmake-gui: Fix error status when interrupted. 6ef858b CMake Nightly Date Stamp e3aac9b CMake Nightly Date Stamp 80a95e1 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52ec845fce84e327216819b7b89183dbbd452636 commit 52ec845fce84e327216819b7b89183dbbd452636 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Tue Sep 4 08:50:21 2012 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Tue Sep 4 08:52:06 2012 -0600 cmake-gui: Fix error status when interrupted. Sometimes it wasn't returning an error and one could continue with the generate generate as if no errors occurred, and even with an incomplete configure step. diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 69673c9..0b2def2 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -92,7 +92,8 @@ public: static bool GetErrorOccuredFlag() { return cmSystemTools::s_ErrorOccured || - cmSystemTools::s_FatalErrorOccured; + cmSystemTools::s_FatalErrorOccured || + GetInterruptFlag(); } ///! If this is set to true, cmake stops processing commands. static void SetFatalErrorOccured() ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmSystemTools.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits