[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-751-ga5f7a59

[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  a5f7a59bbb86a7cfb7792765270722f07a9a679f (commit)
       via  51cfba8c219a923c924349cd255a523eb797e104 (commit)
       via  53862f04a0002894c0ef5aeb23d52495e5abe60d (commit)
      from  7d6e8599e87ee212861488f62f726afe0fd927db (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=a5f7a59bbb86a7cfb7792765270722f07a9a679f
commit a5f7a59bbb86a7cfb7792765270722f07a9a679f
Merge: 7d6e859 51cfba8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 25 09:15:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 25 09:15:53 2016 -0400

    Merge topic 'update-kwsys' into next
    
    51cfba8c Merge branch 'upstream-KWSys' into update-kwsys
    53862f04 KWSys 2016-10-23 (b630d2f5)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51cfba8c219a923c924349cd255a523eb797e104
commit 51cfba8c219a923c924349cd255a523eb797e104
Merge: 2a567c6 53862f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 25 09:13:48 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 25 09:13:48 2016 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-10-23 (b630d2f5)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53862f04a0002894c0ef5aeb23d52495e5abe60d
commit 53862f04a0002894c0ef5aeb23d52495e5abe60d
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Sun Oct 23 04:32:36 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 25 09:13:46 2016 -0400

    KWSys 2016-10-23 (b630d2f5)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit b630d2f5575be7d70c214bfffc57aaf5069c6369 (master).
    
    Upstream Shortlog
    -----------------
    
    Dāvis Mosāns (1):
          b630d2f5 ConsoleBuf: Check for actual console with GetConsoleMode

diff --git a/ConsoleBuf.hxx.in b/ConsoleBuf.hxx.in
index 8aeeda1..2496b45 100644
--- a/ConsoleBuf.hxx.in
+++ b/ConsoleBuf.hxx.in
@@ -239,8 +239,12 @@ namespace @KWSYS_NAMESPACE@
             m_activeInputCodepage = input_file_codepage;
             break;
           case FILE_TYPE_CHAR:
-            m_isConsoleInput = true;
-            break;
+            // Check for actual console.
+            DWORD consoleMode;
+            m_isConsoleInput = GetConsoleMode(m_hInput, &consoleMode) == 0 ? false : true;
+            if (m_isConsoleInput) {
+              break;
+            }
           case FILE_TYPE_PIPE:
             m_activeInputCodepage = input_pipe_codepage;
             break;
@@ -259,8 +263,12 @@ namespace @KWSYS_NAMESPACE@
             m_activeOutputCodepage = output_file_codepage;
             break;
           case FILE_TYPE_CHAR:
-            m_isConsoleOutput = true;
-            break;
+            // Check for actual console.
+            DWORD consoleMode;
+            m_isConsoleOutput = GetConsoleMode(m_hOutput, &consoleMode) == 0 ? false : true;
+            if (m_isConsoleOutput) {
+              break;
+            }
           case FILE_TYPE_PIPE:
             m_activeOutputCodepage = output_pipe_codepage;
             break;

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

Summary of changes:
 Source/kwsys/ConsoleBuf.hxx.in |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake