[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5137-g741a091

[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  741a0912286415e4adb53ca50530f52869ca06e5 (commit)
       via  02e7c858242664e25ad23b766679ef03320042b5 (commit)
      from  eac4dda372fc9ef305db2bb9300f0348204be861 (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=741a0912286415e4adb53ca50530f52869ca06e5
commit 741a0912286415e4adb53ca50530f52869ca06e5
Merge: eac4dda 02e7c85
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 12:58:12 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 12:58:12 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02e7c858242664e25ad23b766679ef03320042b5
commit 02e7c858242664e25ad23b766679ef03320042b5
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 10:57:42 2013 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Nov 13 10:57:42 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 829d1cb..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=\"Windows-1252\"?>\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=\"Windows-1252\"?>\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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake