[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3953-gda83b29

Robert Maynard robert.maynard at kitware.com
Wed Aug 21 10:37:46 EDT 2013


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  da83b29d97e604e70733b9a26de1929c9a0e8d7e (commit)
       via  e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac (commit)
      from  3f6bdd32d1c42de8ce4254b7c9ec1fd07c3d6f6a (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=da83b29d97e604e70733b9a26de1929c9a0e8d7e
commit da83b29d97e604e70733b9a26de1929c9a0e8d7e
Merge: 3f6bdd3 e6730f0
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Aug 21 10:37:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 21 10:37:44 2013 -0400

    Merge topic 'vs2013_toolset_14369' into next
    
    e6730f0 VS: Correct trailing space inside toolset name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac
commit e6730f0a94c3d4f0c1f2fceee1af9f2fae7355ac
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Aug 21 10:37:11 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Aug 21 10:37:11 2013 -0400

    VS: Correct trailing space inside toolset name.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ac888c4..a26b291 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -221,7 +221,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
   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(toolsVer +"\" ");
   project_defaults.append(
           "xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n");
   this->WriteString(project_defaults.c_str(),0);
@@ -725,7 +725,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   const std::string toolsVer(this->GlobalGenerator->GetToolsVersion());
   std::string project_defaults="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
   project_defaults.append("<Project ToolsVersion=\"");
-  project_defaults.append(toolsVer +" \" ");
+  project_defaults.append(toolsVer +"\" ");
   project_defaults.append(
         "xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n");
   this->WriteString(project_defaults.c_str(),0);

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list