[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5148-g414b915

[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  414b9154d15ca0e58bd522c7900795d15d065c0c (commit)
       via  58e3d4948de6308fa3c4a1b619792499cd3b9eba (commit)
      from  0069f9c4d25ab32cc1c2c5feca9d60022121c67c (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=414b9154d15ca0e58bd522c7900795d15d065c0c
commit 414b9154d15ca0e58bd522c7900795d15d065c0c
Merge: 0069f9c 58e3d49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 14 11:25:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 14 11:25:41 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58e3d4948de6308fa3c4a1b619792499cd3b9eba
commit 58e3d4948de6308fa3c4a1b619792499cd3b9eba
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 09:29:07 2013 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 14 11:24:06 2013 -0500

    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..ace1eef 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -219,7 +219,8 @@ 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 +725,8 @@ 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:


hooks/post-receive
-- 
CMake