diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2016-08-02 13:52:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-03 14:10:21 (GMT) |
| commit | 3e6ec47c421808123efac2cf67850f8b75839c67 (patch) | |
| tree | 1c06612a59a7d9c6be48b95d54092177459b5d52 | |
| parent | 6bc3073e23af70bde3e8a7659aa51a784deeec9c (diff) | |
| download | CMake-3e6ec47c421808123efac2cf67850f8b75839c67.zip CMake-3e6ec47c421808123efac2cf67850f8b75839c67.tar.gz CMake-3e6ec47c421808123efac2cf67850f8b75839c67.tar.bz2 | |
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
| -rw-r--r-- | SystemInformation.cxx | 15 | ||||
| -rw-r--r-- | SystemTools.cxx | 5 |
2 files changed, 8 insertions, 12 deletions
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 } //---------------------------------------------------------------------------- |