[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3215-gf7322c4

[Brad King]

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  f7322c49b2655fac6c9f84e13b691c900e8f0bfd (commit)
       via  d83e5834ccfb551fe8d83dfc07a220fffc127019 (commit)
       via  aebf0b6c78dc1c367b67263845888b01ef6d3b90 (commit)
      from  d9a618b3535c7ab0bed98c4e788ec47334877c83 (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=f7322c49b2655fac6c9f84e13b691c900e8f0bfd
commit f7322c49b2655fac6c9f84e13b691c900e8f0bfd
Merge: d9a618b d83e583
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 10:56:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 19 10:56:50 2014 -0400

    Merge topic 'update-kwsys' into next
    
    d83e5834 Merge branch 'upstream-kwsys' into update-kwsys
    aebf0b6c KWSys 2014-05-19 (c282e64f)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d83e5834ccfb551fe8d83dfc07a220fffc127019
commit d83e5834ccfb551fe8d83dfc07a220fffc127019
Merge: 2a47416 aebf0b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 10:57:32 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 10:57:32 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aebf0b6c78dc1c367b67263845888b01ef6d3b90
commit aebf0b6c78dc1c367b67263845888b01ef6d3b90
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon May 19 10:53:51 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 10:57:28 2014 -0400

    KWSys 2014-05-19 (c282e64f)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ c282e64f | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2e00d252..c282e64f
    Brad King (1):
          c282e64f Process: Workaround child kill trouble on Cygwin
    
    Change-Id: I4bacabb849132ca78a3aa656d08a4341a8872660

diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index faeb967..241e295 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -2413,6 +2413,12 @@ static void kwsysProcessKill(pid_t process_id)
   /* Suspend the process to be sure it will not create more children.  */
   kill(process_id, SIGSTOP);
 
+#if defined(__CYGWIN__)
+  /* Some Cygwin versions seem to need help here.  Give up our time slice
+     so that the child can process SIGSTOP before we send SIGKILL.  */
+  usleep(1);
+#endif
+
   /* Kill all children if we can find them.  */
 #if defined(__linux__) || defined(__CYGWIN__)
   /* First try using the /proc filesystem.  */

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/ProcessUNIX.c |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake