[Cmake-commits] CMake branch, next, updated. v3.7.0-1225-ga5749ae

[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  a5749ae9dc21d58857ac856bcde421c6bb3e98b6 (commit)
       via  451e9f93be4a19f18c4a2ac0a1bd6776ba67c327 (commit)
       via  572ac897733f0b6fe7baf67006db0e8f182db59c (commit)
      from  2446a2d281221cb10b2ab218151e2139e05efae4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5749ae9dc21d58857ac856bcde421c6bb3e98b6
commit a5749ae9dc21d58857ac856bcde421c6bb3e98b6
Merge: 2446a2d 451e9f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 16 13:28:16 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 16 13:28:16 2016 -0500

    Merge topic 'update-kwsys' into next
    
    451e9f93 Merge branch 'upstream-KWSys' into update-kwsys
    572ac897 KWSys 2016-11-16 (a0c60eec)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=451e9f93be4a19f18c4a2ac0a1bd6776ba67c327
commit 451e9f93be4a19f18c4a2ac0a1bd6776ba67c327
Merge: 095279b 572ac89
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 16 13:27:07 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 16 13:27:07 2016 -0500

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-11-16 (a0c60eec)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572ac897733f0b6fe7baf67006db0e8f182db59c
commit 572ac897733f0b6fe7baf67006db0e8f182db59c
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Nov 16 11:14:51 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 16 13:27:06 2016 -0500

    KWSys 2016-11-16 (a0c60eec)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit a0c60eec7cdbe7b5d0196bfc5b69bd969fe8786f (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (2):
          818405fc Fix typo in clang-format script documentation
          a0c60eec Terminal: Add tmux to VT100 color support whitelist
    
    Matt Leotta (1):
          6a642f72 SystemInformation: Skip loopback devices in search for FQDN

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 1675da5..e01dcd7 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -79,6 +79,7 @@ typedef int siginfo_t;
 #include <sys/sysctl.h>
 #if defined(KWSYS_SYS_HAS_IFADDRS_H)
 #include <ifaddrs.h>
+#include <net/if.h>
 #define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 #endif
 #endif
@@ -99,6 +100,7 @@ typedef int siginfo_t;
 #include <sys/sysctl.h>
 #if defined(KWSYS_SYS_HAS_IFADDRS_H)
 #include <ifaddrs.h>
+#include <net/if.h>
 #define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 #endif
 #if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - 0 >= 1050)
@@ -113,6 +115,7 @@ typedef int siginfo_t;
 #include <sys/socket.h>
 #if defined(KWSYS_SYS_HAS_IFADDRS_H)
 #include <ifaddrs.h>
+#include <net/if.h>
 #if !defined(__LSB_VERSION__) /* LSB has no getifaddrs */
 #define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 #endif
@@ -1696,7 +1699,9 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName(
 
   for (ifa = ifas; ifa != NULL; ifa = ifa->ifa_next) {
     int fam = ifa->ifa_addr ? ifa->ifa_addr->sa_family : -1;
-    if ((fam == AF_INET) || (fam == AF_INET6)) {
+    // Skip Loopback interfaces
+    if (((fam == AF_INET) || (fam == AF_INET6)) &&
+        !(ifa->ifa_flags & IFF_LOOPBACK)) {
       char host[NI_MAXHOST] = { '\0' };
 
       const size_t addrlen = (fam == AF_INET ? sizeof(struct sockaddr_in)
diff --git a/Terminal.c b/Terminal.c
index 26174a1..c0b7f45 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -150,6 +150,8 @@ static const char* kwsysTerminalVT100Names[] = { "Eterm",
                                                  "screen-bce",
                                                  "screen-w",
                                                  "screen.linux",
+                                                 "tmux",
+                                                 "tmux-256color",
                                                  "vt100",
                                                  "xterm",
                                                  "xterm-16color",

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |    7 ++++++-
 Source/kwsys/Terminal.c            |    2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake