[Cmake-commits] CMake branch, next, updated. v2.8.10-730-g88bb57e

[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  88bb57e9c282d6d8790090f7386e3344e560bfcb (commit)
       via  13e741f5cca6f4267b4cd466b2b8ae7054f9983b (commit)
       via  f4b58ed137d0c9b12eefe1a0fbc6af9c1b7043b7 (commit)
      from  0b2840f1d93a27abef18288faba8ebbb061d3672 (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=88bb57e9c282d6d8790090f7386e3344e560bfcb
commit 88bb57e9c282d6d8790090f7386e3344e560bfcb
Merge: 0b2840f 13e741f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 3 19:27:31 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 3 19:27:31 2012 -0400

    Merge topic 'fix-KWSys-SystemInformation' into next
    
    13e741f CTestCustom: Suppress LNK4089 warning about PSAPI
    f4b58ed KWSys: In SystemInformation skip getifaddrs on LSB


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13e741f5cca6f4267b4cd466b2b8ae7054f9983b
commit 13e741f5cca6f4267b4cd466b2b8ae7054f9983b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 3 19:25:01 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 3 19:26:06 2012 -0400

    CTestCustom: Suppress LNK4089 warning about PSAPI
    
    Add a warning suppression regex to match:
    
     LINK : warning LNK4089: all references to 'PSAPI.DLL' discarded by /OPT:REF

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 9829191..4d13c76 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -31,6 +31,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
   "remark: .*LOOP WAS VECTORIZED"
   "warning .980: wrong number of actual arguments to intrinsic function .std::basic_"
   "LINK : warning LNK4089: all references to.*ADVAPI32.dll.*discarded by /OPT:REF"
+  "LINK : warning LNK4089: all references to.*PSAPI.dll.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*USER32.dll.*discarded by /OPT:REF"
   "Warning: library was too large for page size.*"
   "Warning: public.*_archive_.*in module.*archive_*clashes with prior module.*archive_.*"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b58ed137d0c9b12eefe1a0fbc6af9c1b7043b7
commit f4b58ed137d0c9b12eefe1a0fbc6af9c1b7043b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 3 19:22:19 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 3 19:22:19 2012 -0400

    KWSys: In SystemInformation skip getifaddrs on LSB
    
    The getifaddrs API is not available on LSB.

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 83dedfd..d534adb 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -103,6 +103,9 @@ typedef int siginfo_t;
 # include <sys/socket.h>
 # include <netdb.h>
 # include <netinet/in.h>
+# if defined(__LSB_VERSION__) /* LSB has no getifaddrs */
+#  undef KWSYS_SYS_HAS_IFADDRS_H
+# endif
 # if defined(__GNUG__)
 #  include <execinfo.h>
 #  if !(defined(__LSB_VERSION__) && __LSB_VERSION__ < 41)

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

Summary of changes:
 CTestCustom.cmake.in               |    1 +
 Source/kwsys/SystemInformation.cxx |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake