[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5133-g7f84e62

[Clinton Stimpson]

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  7f84e628f1b74323d329ccda2062210cb32c08b6 (commit)
       via  efe3a5dd6572d05c244f92601e9a41e9efc4fc08 (commit)
      from  9cbfb82e873f1c3cc454da2482d163d7e7a7e4f0 (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=7f84e628f1b74323d329ccda2062210cb32c08b6
commit 7f84e628f1b74323d329ccda2062210cb32c08b6
Merge: 9cbfb82 efe3a5d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 11:34:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 11:34:30 2013 -0500

    Merge topic 'msvc-encoding' into next
    
    efe3a5d MSVC: Fix encoding of Visual Studio 10+ project files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe3a5dd6572d05c244f92601e9a41e9efc4fc08
commit efe3a5dd6572d05c244f92601e9a41e9efc4fc08
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 09:29:07 2013 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Nov 13 09:32:05 2013 -0700

    MSVC: Fix encoding of Visual Studio 10+ project files.
    
    Use Windows-1252, which is the same encoding as older
    Visual Studio project files.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ab97b5e..829d1cb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -219,7 +219,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 
   //get the tools version to use
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
-  std::string project_defaults="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+  std::string project_defaults="<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n";
   project_defaults.append("<Project DefaultTargets=\"Build\" ToolsVersion=\"");
   project_defaults.append(toolsVer +"\" ");
   project_defaults.append(
@@ -724,7 +724,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
 
   //get the tools version to use
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
-  std::string project_defaults="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+  std::string project_defaults="<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n";
   project_defaults.append("<Project ToolsVersion=\"");
   project_defaults.append(toolsVer +"\" ");
   project_defaults.append(

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake