[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2628-g2c0e2cd

[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  2c0e2cd8f961efa75cebe042fd40375d8e2f8327 (commit)
       via  c677838c1a608dd182b238154050a94ab79d6bc4 (commit)
      from  c1562a65ec4d31dfd6ce54d0ef8e25a40e4a5ae2 (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=2c0e2cd8f961efa75cebe042fd40375d8e2f8327
commit 2c0e2cd8f961efa75cebe042fd40375d8e2f8327
Merge: c1562a6 c677838
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 25 14:27:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 25 14:27:06 2013 -0400

    Merge topic 'vs-sln-header' into next
    
    c677838 VS: Fix VS 10/11 .sln headers (#14038)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c677838c1a608dd182b238154050a94ab79d6bc4
commit c677838c1a608dd182b238154050a94ab79d6bc4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 25 13:30:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 25 14:25:14 2013 -0400

    VS: Fix VS 10/11 .sln headers (#14038)
    
    The VS version we generate in the .sln header is used by VS when opening
    the file through Windows Explorer and possibly elsewhere.  Fix our
    generators to use version strings known to VS to avoid a drop-down box.
    
    For VS 10, since commit 4f96af44 (Fix VS 10 .sln files for Windows
    Explorer, 2009-10-22) we use "Visual Studio 2010" instead of just
    "Visual Studio 10".  This is correct except that for the Express edition
    we need "Visual C++ Express 2010".
    
    For VS 11, since commit f0d66ab4 (VS11: Fix comment generated at the top
    of *.sln files, 2011-10-20) we use "Visual Studio 11" in the .sln header
    but the preferred value is "Visual Studio 2012" (just as the first
    commit mentioned above fixed for VS 10).  Also for the Express edition
    we need "Visual Studio Express 2012 for Windows Desktop".

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index cac72fc..b8c4939 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -102,7 +102,14 @@ void cmGlobalVisualStudio10Generator::AddPlatformDefinitions(cmMakefile* mf)
 void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout)
 {
   fout << "Microsoft Visual Studio Solution File, Format Version 11.00\n";
-  fout << "# Visual Studio 2010\n";
+  if (this->ExpressEdition)
+    {
+    fout << "# Visual C++ Express 2010\n";
+    }
+  else
+    {
+    fout << "# Visual Studio 2010\n";
+    }
 }
 
 ///! Create a local generator appropriate to this Global Generator
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index b6d7d04..299aaa8 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -81,7 +81,14 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(
 void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout)
 {
   fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
-  fout << "# Visual Studio 11\n";
+  if (this->ExpressEdition)
+    {
+    fout << "# Visual Studio Express 2012 for Windows Desktop\n";
+    }
+  else
+    {
+    fout << "# Visual Studio 2012\n";
+    }
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |    9 ++++++++-
 Source/cmGlobalVisualStudio11Generator.cxx |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake