[Cmake-commits] CMake branch, next, updated. v3.6.1-1092-g74da9df

[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  74da9df98805c96d2846be6c7f735aa9bd0f8030 (commit)
       via  b602cb85c90bba26bff04d570bf108658016cf07 (commit)
       via  3e6ec47c421808123efac2cf67850f8b75839c67 (commit)
      from  7b960cc5502785e6bf4e7e0a4d166c71330bda55 (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=74da9df98805c96d2846be6c7f735aa9bd0f8030
commit 74da9df98805c96d2846be6c7f735aa9bd0f8030
Merge: 7b960cc b602cb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 3 10:10:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 3 10:10:53 2016 -0400

    Merge topic 'update-kwsys' into next
    
    b602cb85 Merge branch 'upstream-KWSys' into update-kwsys
    3e6ec47c KWSys 2016-08-02 (3f55579d)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b602cb85c90bba26bff04d570bf108658016cf07
commit b602cb85c90bba26bff04d570bf108658016cf07
Merge: 382c4fc 3e6ec47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 3 10:10:28 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 3 10:10:28 2016 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-08-02 (3f55579d)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e6ec47c421808123efac2cf67850f8b75839c67
commit 3e6ec47c421808123efac2cf67850f8b75839c67
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Tue Aug 2 09:52:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 3 10:10:21 2016 -0400

    KWSys 2016-08-02 (3f55579d)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit 3f55579d113f92fcda8f9eff7046c36873c121f6 (master).
    
    Upstream Shortlog
    -----------------
    
    Patrick Welche (3):
          8a989b44 SystemInformation: Treat BSDs more uniformly
          2ce319a6 SystemInformation: Treat Solaris the same as Linux
          3f55579d SystemTools: Fix FileExists for some SCO OpenServer file permissions

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 81fb2f9..56a635a 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -79,9 +79,9 @@ typedef int siginfo_t;
 # undef _WIN32
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+# include <sys/param.h>
 # include <sys/sysctl.h>
-# include <fenv.h>
 # include <sys/socket.h>
 # include <netdb.h>
 # include <netinet/in.h>
@@ -91,19 +91,10 @@ typedef int siginfo_t;
 # endif
 #endif
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-# include <sys/param.h>
-# include <sys/sysctl.h>
-#endif
-
 #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
 # include <machine/cpu.h>
 #endif
 
-#if defined(__DragonFly__)
-# include <sys/sysctl.h>
-#endif
-
 #ifdef __APPLE__
 # include <sys/sysctl.h>
 # include <mach/vm_statistics.h>
@@ -123,7 +114,7 @@ typedef int siginfo_t;
 # endif
 #endif
 
-#ifdef __linux
+#if defined(__linux) || defined (__sun) || defined(_SCO_DS)
 # include <fenv.h>
 # include <sys/socket.h>
 # include <netdb.h>
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 9b56db0..d479ee1 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -1321,8 +1321,13 @@ bool SystemTools::FileExists(const std::string& filename)
             SystemTools::ConvertToWindowsExtendedPath(filename).c_str())
           != INVALID_FILE_ATTRIBUTES);
 #else
+// SCO OpenServer 5.0.7/3.2's command has 711 permission.
+#if defined(_SCO_DS)
+  return access(filename.c_str(), F_OK) == 0;
+#else
   return access(filename.c_str(), R_OK) == 0;
 #endif
+#endif
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |   15 +++------------
 Source/kwsys/SystemTools.cxx       |    5 +++++
 2 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake