[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-462-g7509065

[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  750906500d08cff001762412c2f307022836a879 (commit)
       via  2ef26ebebf2a405f342ed8623a185ec1bd4b4b38 (commit)
      from  0be1721b533ae213fc255aeb5063f3dee204c8d2 (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=750906500d08cff001762412c2f307022836a879
commit 750906500d08cff001762412c2f307022836a879
Merge: 0be1721 2ef26eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 08:44:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 14 08:44:03 2016 -0400

    Merge topic 'consoleBuf' into next
    
    2ef26ebe Revert "Enable Unicode output to Windows consoles"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ef26ebebf2a405f342ed8623a185ec1bd4b4b38
commit 2ef26ebebf2a405f342ed8623a185ec1bd4b4b38
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 08:43:23 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 14 08:43:23 2016 -0400

    Revert "Enable Unicode output to Windows consoles"
    
    This reverts commit 4551b1ae134a3d1f6c7a30a9b941000a466a11ef.
    It causes RunCMake.IncludeWhatYouUse to fail with Ninja on
    Windows.  This needs to be investigated and fixed first.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bc4b4e..b8a635f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,7 +260,6 @@ macro (CMAKE_BUILD_UTILITIES)
   set(KWSYS_USE_MD5 1)
   set(KWSYS_USE_Process 1)
   set(KWSYS_USE_CommandLineArguments 1)
-  set(KWSYS_USE_ConsoleBuf 1)
   set(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
   set(KWSYS_INSTALL_DOC_DIR "${CMAKE_DOC_DIR}")
   add_subdirectory(Source/kwsys)
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 1e9bb0f..a3281ab 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -17,9 +17,6 @@
 
 #include <cmsys/CommandLineArguments.hxx>
 #include <cmsys/Encoding.hxx>
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-#include <cmsys/ConsoleBuf.hxx>
-#endif
 #include <iostream>
 #include <map>
 #include <sstream>
@@ -87,11 +84,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
 // this is CPack.
 int main(int argc, char const* const* argv)
 {
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-  // Replace streambuf so we can output Unicode to console
-  cmsys::ConsoleBuf::Manager consoleOut(std::cout);
-  cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true);
-#endif
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = args.argc();
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 3f71011..0d1f1ce 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -18,9 +18,6 @@
 
 #include <cmConfigure.h>
 #include <cmsys/Encoding.hxx>
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-#include <cmsys/ConsoleBuf.hxx>
-#endif
 #include <iostream>
 #include <string.h>
 #include <string>
@@ -156,11 +153,6 @@ static void cmakemainProgressCallback(const char* m, float prog,
 
 int main(int ac, char const* const* av)
 {
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-  // Replace streambuf so we can output Unicode to console
-  cmsys::ConsoleBuf::Manager consoleOut(std::cout);
-  cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true);
-#endif
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 1acd240..8ab17b9 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -10,9 +10,6 @@
 #include "cmake.h"
 
 #include <cmsys/Encoding.hxx>
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-#include <cmsys/ConsoleBuf.hxx>
-#endif
 #include <iostream>
 #include <string.h>
 #include <string>
@@ -113,11 +110,6 @@ static const char* cmDocumentationOptions[][2] = {
 // this is a test driver program for cmCTest.
 int main(int argc, char const* const* argv)
 {
-#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-  // Replace streambuf so we can output Unicode to console
-  cmsys::ConsoleBuf::Manager consoleOut(std::cout);
-  cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true);
-#endif
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();

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

Summary of changes:
 CMakeLists.txt         |    1 -
 Source/CPack/cpack.cxx |    8 --------
 Source/cmakemain.cxx   |    8 --------
 Source/ctest.cxx       |    8 --------
 4 files changed, 25 deletions(-)


hooks/post-receive
-- 
CMake