[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2604-gb147ee4

Brad King brad.king at kitware.com
Fri Mar 22 08:52:16 EDT 2013


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  b147ee469aa9ff4f7db106495249461b8bfc3644 (commit)
       via  3ed2d03ee9ed9736656c8021e8f740540c9a2b7a (commit)
       via  83a9f09d184c89c79c0d8ec52868ad68b0604d5d (commit)
       via  aa16a433d3634d668c211b1aa5b13271b85dffc8 (commit)
      from  276ce96bebf099c89ad15c6bf9974a28e4ee2f75 (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=b147ee469aa9ff4f7db106495249461b8bfc3644
commit b147ee469aa9ff4f7db106495249461b8bfc3644
Merge: 276ce96 3ed2d03
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 22 08:52:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 22 08:52:08 2013 -0400

    Merge topic 'update-kwsys' into next
    
    3ed2d03 Merge branch 'upstream-kwsys' into update-kwsys
    83a9f09 KWSys 2013-03-21 (2d263bc3)
    aa16a43 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ed2d03ee9ed9736656c8021e8f740540c9a2b7a
commit 3ed2d03ee9ed9736656c8021e8f740540c9a2b7a
Merge: aa16a43 83a9f09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 22 08:08:03 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 22 08:08:03 2013 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83a9f09d184c89c79c0d8ec52868ad68b0604d5d
commit 83a9f09d184c89c79c0d8ec52868ad68b0604d5d
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Mar 21 14:49:23 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 22 08:07:58 2013 -0400

    KWSys 2013-03-21 (2d263bc3)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 2d263bc3 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5c34ed2e..2d263bc3
    Paul Kunysch (1):
          2d263bc3 Process: Increase FD_SETSIZE on Cygwin
    
    Sean McBride (1):
          13f5badd SystemInformation: Replace __GNUG__ with __GNUC__
    
    Change-Id: I2d29f6d7e9bbc34f7a9b40394a7ee05f3c537396

diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index fc9e8bf..b9af2f1 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -47,6 +47,12 @@ do.
 
 */
 
+#if defined(__CYGWIN__)
+/* Increase the file descriptor limit for select() before including
+   related system headers. (Default: 64) */
+# define FD_SETSIZE 16384
+#endif
+
 #include <stddef.h>    /* ptrdiff_t */
 #include <stdio.h>     /* snprintf */
 #include <stdlib.h>    /* malloc, free */
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index f057e0f..9e2a93d 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -130,7 +130,7 @@ typedef int siginfo_t;
 #   define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 #  endif
 # endif
-# if defined(__GNUG__)
+# if defined(__GNUC__)
 #  include <execinfo.h>
 #  if !(defined(__LSB_VERSION__) && __LSB_VERSION__ < 41)
 #   define KWSYS_SYSTEMINFORMATION_HAVE_BACKTRACE

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

Summary of changes:
 Source/CMakeVersion.cmake          |    2 +-
 Source/kwsys/ProcessUNIX.c         |    6 ++++++
 Source/kwsys/SystemInformation.cxx |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list