[Cmake-commits] CMake branch, master, updated. v3.12.1-405-geba2b13

[Kitware Robot]

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, master has been updated
       via  eba2b13a835000a614f21a1205a598462a4f8843 (commit)
       via  7e359823c9cd5bf162e3e62561328607d4449a59 (commit)
       via  b7e7718a38194879a43bce580ad5e831621ded91 (commit)
      from  0077c8c2637043b93f67ee310727542c081dc138 (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=eba2b13a835000a614f21a1205a598462a4f8843
commit eba2b13a835000a614f21a1205a598462a4f8843
Merge: 0077c8c 7e35982
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 10 15:00:52 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 10 11:01:11 2018 -0400

    Merge topic 'msvc-link-non-english'
    
    7e359823c9 MSVC: Preserve linker output encoding
    b7e7718a38 MSVC: Fix manifest resource encoding
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2261


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e359823c9cd5bf162e3e62561328607d4449a59
commit 7e359823c9cd5bf162e3e62561328607d4449a59
Author:     Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Fri Aug 3 13:53:08 2018 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 9 11:06:12 2018 -0400

    MSVC: Preserve linker output encoding
    
    When using the Ninja or Makefile generator with MSVC on Windows
    we invoke the linker through a `cmake -E vs_link_{exe,dll}` wrapper.
    Preserve the linker output encoding to match `link.exe` behavior
    instead of forcing UTF-8.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 2fd1a84..2027722 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -24,6 +24,7 @@
 
 #if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32)
 #  include "bindexplib.h"
+#  include "cmsys/ConsoleBuf.hxx"
 #endif
 
 #if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) && !defined(__CYGWIN__)
@@ -1545,6 +1546,15 @@ private:
 // still works.
 int cmcmd::VisualStudioLink(std::vector<std::string> const& args, int type)
 {
+#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
+  // Replace streambuf so we output in the system codepage. CMake is set up
+  // to output in Unicode (see SetUTF8Pipes) but the Visual Studio linker
+  // outputs using the system codepage so we need to change behavior when
+  // we run the link command.
+  cmsys::ConsoleBuf::Manager consoleOut(std::cout);
+  cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true);
+#endif
+
   if (args.size() < 2) {
     return -1;
   }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7e7718a38194879a43bce580ad5e831621ded91
commit b7e7718a38194879a43bce580ad5e831621ded91
Author:     Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Fri Aug 3 13:53:08 2018 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 9 11:03:10 2018 -0400

    MSVC: Fix manifest resource encoding
    
    When using the Ninja or Makefile generator with MSVC on Windows
    we invoke the resource compiler (`rc.exe`) to compile a manifest
    resource.  CMake generates the file with UTF-8 encoding so we
    need to add a pragma to inform the resource compiler.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0a75e77..2fd1a84 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1775,6 +1775,8 @@ int cmVSLink::LinkIncremental()
     if (!fout) {
       return -1;
     }
+    // Insert a pragma statement to specify utf-8 encoding.
+    fout << "#pragma code_page(65001)\n";
     fout << this->Type
          << " /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ "
             "24 /* RT_MANIFEST */ \""

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

Summary of changes:
 Source/cmcmd.cxx | 12 ++++++++++++
 1 file changed, 12 insertions(+)


hooks/post-receive
-- 
CMake