[Cmake-commits] CMake branch, next, updated. v2.8.10-700-g108910e

[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  108910ed07828f4d919572bbc613f82b6d196564 (commit)
       via  2ca56fd86c22fb1c65eca1c0cb6c37d467884813 (commit)
       via  53c3de07c7d9c4cc99a7cf0deaf228f563ba8d06 (commit)
      from  0baf4365ba53001e3d528d67c46a6926cc675b37 (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=108910ed07828f4d919572bbc613f82b6d196564
commit 108910ed07828f4d919572bbc613f82b6d196564
Merge: 0baf436 2ca56fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 2 08:29:46 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 2 08:29:46 2012 -0400

    Merge topic 'fix-KWSys-SystemInformation' into next
    
    2ca56fd KWSys: Fix SystemInformation on FreeBSD
    53c3de0 KWSys: In SystemInformation skip backtrace on LSB < 4.1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ca56fd86c22fb1c65eca1c0cb6c37d467884813
commit 2ca56fd86c22fb1c65eca1c0cb6c37d467884813
Author:     Richard Wackerbarth <richard at NFSNet.org>
AuthorDate: Fri Nov 2 08:26:04 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 2 08:29:26 2012 -0400

    KWSys: Fix SystemInformation on FreeBSD
    
    Add missing includes for this platform.

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 7612138..83dedfd 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -74,6 +74,14 @@ typedef int siginfo_t;
 # include <errno.h> // extern int errno;
 #endif
 
+#ifdef __FreeBSD__
+# include <sys/sysctl.h>
+# include <fenv.h>
+# include <sys/socket.h>
+# include <netdb.h>
+# include <netinet/in.h>
+#endif
+
 #ifdef __APPLE__
 # include <sys/sysctl.h>
 # include <mach/vm_statistics.h>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53c3de07c7d9c4cc99a7cf0deaf228f563ba8d06
commit 53c3de07c7d9c4cc99a7cf0deaf228f563ba8d06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 1 10:46:18 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 2 08:29:26 2012 -0400

    KWSys: In SystemInformation skip backtrace on LSB < 4.1
    
    The backtrace API was added in LSB 4.1 but does not exist in 4.0.

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 8d2d191..7612138 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -97,7 +97,9 @@ typedef int siginfo_t;
 # include <netinet/in.h>
 # if defined(__GNUG__)
 #  include <execinfo.h>
-#  define KWSYS_SYSTEMINFORMATION_HAVE_BACKTRACE
+#  if !(defined(__LSB_VERSION__) && __LSB_VERSION__ < 41)
+#   define KWSYS_SYSTEMINFORMATION_HAVE_BACKTRACE
+#  endif
 # endif
 # if defined(KWSYS_CXX_HAS_RLIMIT64)
 typedef struct rlimit64 ResourceLimitType;

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

Summary of changes:


hooks/post-receive
-- 
CMake