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 7b49ab966dd0a0f80c15232fde1641b3818c529d (commit) via 2c050a2e11afe41c89bae8075f8a55bae0e8244e (commit) via 711f3ccb0400ecede1d5ccc100f017bbb3475d31 (commit) via cfb909afb87be1f04ad0adf66db5f87ef26343b1 (commit) via 262a259e77177b964518a6195b8a2451fc99f0f1 (commit) via e6d28c7e6f2b73b441b19829fdda67d1b84b9acc (commit) from 0130ed8daf5f70bc963e38f4ce92119f5fb76327 (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=7b49ab966dd0a0f80c15232fde1641b3818c529d commit 7b49ab966dd0a0f80c15232fde1641b3818c529d Merge: 0130ed8 2c050a2 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Apr 30 15:13:02 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Apr 30 15:13:02 2012 -0400 Merge topic 'cmake-gui-thread-wait' into next 2c050a2 cmake-gui: Wait for configure/generate thread to complete before exiting. 711f3cc CMake Nightly Date Stamp cfb909a CMake Nightly Date Stamp 262a259 CMake Nightly Date Stamp e6d28c7 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c050a2e11afe41c89bae8075f8a55bae0e8244e commit 2c050a2e11afe41c89bae8075f8a55bae0e8244e Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Apr 30 13:12:16 2012 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Mon Apr 30 13:12:16 2012 -0600 cmake-gui: Wait for configure/generate thread to complete before exiting. A prevous fix to interrupt granularity makes it so we don't have to wait very long. diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 45b4cd3..5cd4f29 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -288,7 +288,7 @@ CMakeSetupDialog::~CMakeSetupDialog() // wait for thread to stop this->CMakeThread->quit(); - this->CMakeThread->wait(2000); + this->CMakeThread->wait(); } bool CMakeSetupDialog::prepareConfigure() ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/QtDialog/CMakeSetupDialog.cxx | 2 +- 2 files changed, 2 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