[Cmake-commits] CMake branch, next, updated. v2.8.6-1605-g51b2f74

David Cole david.cole at kitware.com
Thu Oct 20 18:50:23 EDT 2011


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  51b2f74062eca6b6d85017bf5a96cb341ece9347 (commit)
       via  f0d66ab40aee3af3d201201e7b1275783ffbab36 (commit)
       via  173fb485f076089bca2aa4a7c9e2631e8c94a0b0 (commit)
       via  1b6c33f79874ce7c03c6895ea531472b7d89a4ed (commit)
      from  6aa236e2ca934fbb9a8450333cf7074a92931912 (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=51b2f74062eca6b6d85017bf5a96cb341ece9347
commit 51b2f74062eca6b6d85017bf5a96cb341ece9347
Merge: 6aa236e f0d66ab
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Oct 20 18:50:16 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 20 18:50:16 2011 -0400

    Merge topic 'fix-vs11-sln-header' into next
    
    f0d66ab VS11: Fix comment generated at the top of *.sln files
    173fb48 KWSys Nightly Date Stamp
    1b6c33f KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d66ab40aee3af3d201201e7b1275783ffbab36
commit f0d66ab40aee3af3d201201e7b1275783ffbab36
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Oct 20 18:48:26 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Oct 20 18:48:26 2011 -0400

    VS11: Fix comment generated at the top of *.sln files
    
    With "Visual Studio 2011" the launcher does not recognize the version
    of the *.sln files. With "Visual Studio 11" it does.

diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index a70427a..97308bb 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -32,7 +32,7 @@ void cmGlobalVisualStudio11Generator::AddPlatformDefinitions(cmMakefile* mf)
 void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout)
 {
   fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
-  fout << "# Visual Studio 2011\n";
+  fout << "# Visual Studio 11\n";
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGlobalVisualStudio11Generator.cxx |    2 +-
 Source/kwsys/kwsysDateStamp.cmake          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list