[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3943-g90257b8

[Robert Maynard]

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  90257b817393fec01b03a239904d107cd004543d (commit)
       via  e10ceec8a0b2870af2a01160c2438e382f7c7251 (commit)
      from  be3cda3d00d617fa08599291b5c5b8138824bf5a (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=90257b817393fec01b03a239904d107cd004543d
commit 90257b817393fec01b03a239904d107cd004543d
Merge: be3cda3 e10ceec
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Aug 20 16:25:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 20 16:25:42 2013 -0400

    Merge topic 'vs2013_toolset_14369' into next
    
    e10ceec VS: Corrected usaged of std::string append.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10ceec8a0b2870af2a01160c2438e382f7c7251
commit e10ceec8a0b2870af2a01160c2438e382f7c7251
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Aug 20 16:20:19 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Aug 20 16:20:19 2013 -0400

    VS: Corrected usaged of std::string append.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 532f417..effe966 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -219,11 +219,10 @@ void cmVisualStudio10TargetGenerator::Generate()
 
   //get the tools version to use
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
-  const std::string project_defaults =
-    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-    "<Project DefaultTargets=\"Build\" ToolsVersion=\" " + toolsVer + "\" " +
-    "xmlns=\"http://schemas.microsoft.com/" +
-    "developer/msbuild/2003\">\n";
+  std::string project_defaults = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+  project_defaults.append("<Project DefaultTargets=\"Build\" ToolsVersion=\"");
+  project_defaults.append(toolsVer +" \" ");
+  project_defaults.append("xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n");
   this->WriteString(project_defaults.c_str(),0);
 
   this->WriteProjectConfigurations();
@@ -723,11 +722,10 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
 
   //get the tools version to use
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
-  const std::string project_defaults =
-    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-    "<Project ToolsVersion=\" " + toolsVer + "\" " +
-    "xmlns=\"http://schemas.microsoft.com/" +
-    "developer/msbuild/2003\">\n";
+  std::string project_defaults = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+  project_defaults.append("<Project ToolsVersion=\"");
+  project_defaults.append(toolsVer +" \" ");
+  project_defaults.append("xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n");
   this->WriteString(project_defaults.c_str(),0);
 
   for(ToolSourceMap::const_iterator ti = this->Tools.begin();

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

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


hooks/post-receive
-- 
CMake