[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-900-g77b88ee

[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  77b88ee5b8fa9560310b6b4c6975639809caf451 (commit)
       via  fa635edaa121cfa688615ca7c07432f5c3e686d7 (commit)
      from  612bb575cbaf3ed9f6acad58a25e54bad09edd18 (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=77b88ee5b8fa9560310b6b4c6975639809caf451
commit 77b88ee5b8fa9560310b6b4c6975639809caf451
Merge: 612bb57 fa635ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 10:30:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 2 10:30:11 2016 -0400

    Merge topic 'remove-utf8-option' into next
    
    fa635eda fixup! Encoding: Remove option to use ANSI code page internally


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa635edaa121cfa688615ca7c07432f5c3e686d7
commit fa635edaa121cfa688615ca7c07432f5c3e686d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 10:29:33 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 10:29:33 2016 -0400

    fixup! Encoding: Remove option to use ANSI code page internally

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 5320449..4c8abd9 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -410,8 +410,7 @@ void cmCPackWIXGenerator::AddDefinition(cmWIXSourceWriter& source,
   std::ostringstream tmp;
   tmp << name << "=\"" << value << '"';
 
-  source.AddProcessingInstruction(
-    "define", cmWIXSourceWriter::CMakeEncodingToUtf8(tmp.str()));
+  source.AddProcessingInstruction("define", tmp.str());
 }
 
 bool cmCPackWIXGenerator::CreateWiXSourceFiles()

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake