[Cmake-commits] CMake branch, master, updated. 9c0937f8c2df63745bfe63db699a0edcb71950f3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue May 11 13:40:09 EDT 2010
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, master has been updated
via 9c0937f8c2df63745bfe63db699a0edcb71950f3 (commit)
from ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c (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=9c0937f8c2df63745bfe63db699a0edcb71950f3
commit 9c0937f8c2df63745bfe63db699a0edcb71950f3
Author: Brad King <brad.king at kitware.com>
Date: Tue May 11 13:34:54 2010 -0400
KWSys: Process tree kill for kFreeBSD, GNU/Hurd
kFreeBSD and Hurd have the same userland as Linux. This change is
necessary to enable kwsysProcessKill() to kill child processes on
kFreeBSD. The bug was detected by CTestTestTimeout test.
Patch from "Modestas Vainius <modestas at vainius.eu>".
See issue #10432.
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
index b368901..9cb787a 100644
--- a/Source/kwsys/ProcessUNIX.c
+++ b/Source/kwsys/ProcessUNIX.c
@@ -2374,7 +2374,7 @@ static pid_t kwsysProcessFork(kwsysProcess* cp,
corresponding parsing format string. The parsing format should
have two integers to store: the pid and then the ppid. */
#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
- || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+ || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
#elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/ProcessUNIX.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list