[Cmake-commits] CMake branch, next, updated. v3.1.0-1605-ge51cf42

[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  e51cf4204b190f9e85186b3552634bb7bc22f76d (commit)
       via  6c3e3c1fc60759f3818201c63b897babd9884ee7 (commit)
       via  60c5ab9ac8ae09d2eb65bcde93040b9bc0fc5a78 (commit)
       via  4aa9c64511adb6e3aa1b686d07f8cbdf92dedbab (commit)
      from  cf0d9e84916ebbcd14fd3df5fd8b9b856c1edb5b (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=e51cf4204b190f9e85186b3552634bb7bc22f76d
commit e51cf4204b190f9e85186b3552634bb7bc22f76d
Merge: cf0d9e8 6c3e3c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 9 08:56:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 9 08:56:25 2015 -0500

    Merge topic 'update-kwsys' into next
    
    6c3e3c1f Merge branch 'upstream-kwsys' into update-kwsys
    60c5ab9a KWSys 2015-01-09 (d30c9b03)
    4aa9c645 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c3e3c1fc60759f3818201c63b897babd9884ee7
commit 6c3e3c1fc60759f3818201c63b897babd9884ee7
Merge: 4aa9c64 60c5ab9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 9 08:55:40 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 9 08:55:40 2015 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60c5ab9ac8ae09d2eb65bcde93040b9bc0fc5a78
commit 60c5ab9ac8ae09d2eb65bcde93040b9bc0fc5a78
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 9 08:54:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 9 08:55:35 2015 -0500

    KWSys 2015-01-09 (d30c9b03)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ d30c9b03 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5a15cb3b..d30c9b03
    Simon Gomizelj (1):
          2f0165f1 Terminal: Add xterm-termite to VT100 color support whitelist
    
    Stephen Kelly (3):
          e4fe1d1a SystemTools: Refactor selection of Windows directory APIs
          af86ac7d SystemTools: Fix build with SunCC/stlport.
          d30c9b03 Workaround SolarisStudio bug with libstdc++.
    
    Change-Id: I0b0fd1c38f0a0fa246e5b862fc62bec6cfbf40c4

diff --git a/SystemTools.cxx b/SystemTools.cxx
index e4c82d8..c2b6097 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -16,6 +16,14 @@
 #  define _XOPEN_SOURCE_EXTENDED
 #endif
 
+#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
+#  define KWSYS_WINDOWS_DIRS
+#else
+#  if defined(__SUNPRO_CC)
+#    include <fcntl.h>
+#  endif
+#endif
+
 #include "kwsysPrivate.h"
 #include KWSYS_HEADER(RegularExpression.hxx)
 #include KWSYS_HEADER(SystemTools.hxx)
@@ -205,8 +213,7 @@ static time_t windows_filetime_to_posix_time(const FILETIME& ft)
 }
 #endif
 
-#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
-
+#ifdef KWSYS_WINDOWS_DIRS
 #include <wctype.h>
 
 inline int Mkdir(const kwsys_stl::string& dir)
diff --git a/Terminal.c b/Terminal.c
index e13003f..d13f79a 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -175,6 +175,7 @@ static const char* kwsysTerminalVT100Names[] =
   "xterm-88color",
   "xterm-color",
   "xterm-debian",
+  "xterm-termite",
   0
 };
 
diff --git a/kwsysPlatformTestsCXX.cxx b/kwsysPlatformTestsCXX.cxx
index 3f947f3..82620da 100644
--- a/kwsysPlatformTestsCXX.cxx
+++ b/kwsysPlatformTestsCXX.cxx
@@ -548,6 +548,10 @@ int main()
 #if (defined(__GNUC__) || defined(__PGI)) && !defined(_GNU_SOURCE)
 # define _GNU_SOURCE
 #endif
+#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5130 \
+     && __linux && __SUNPRO_CC_COMPAT == 'G'
+#  include <iostream>
+#endif
 #include <cxxabi.h>
 int main()
 {

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/kwsys/Terminal.c   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake