[Cmake-commits] CMake branch, next, updated. v2.8.9-549-g51d6a17

[Peter Kuemmel]

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  51d6a1737bd8af432da7a586169245c2b9c58b63 (commit)
       via  afa9fae06ef28d40f0d4b3b3e014e8dfe3b943e6 (commit)
       via  875f3a4231766d9534304b3bb74a321c1bcd15d1 (commit)
       via  c5f36de99ede2d53fe785f96bc3dc0f73bca9c64 (commit)
       via  f155e9ae2ea4ce970ac93d03b0b6b421333d83a8 (commit)
      from  086a97df9f977607fe8202c9c6d7029d3f9c7a26 (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=51d6a1737bd8af432da7a586169245c2b9c58b63
commit 51d6a1737bd8af432da7a586169245c2b9c58b63
Merge: 086a97d afa9fae
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Sep 16 08:42:36 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 16 08:42:36 2012 -0400

    Merge topic 'vs11-default' into next
    
    afa9fae also find Visual Studio 11
    875f3a4 CMake Nightly Date Stamp
    c5f36de CMake Nightly Date Stamp
    f155e9a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afa9fae06ef28d40f0d4b3b3e014e8dfe3b943e6
commit afa9fae06ef28d40f0d4b3b3e014e8dfe3b943e6
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Sep 16 00:01:32 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Sep 16 00:01:32 2012 +0200

    also find Visual Studio 11

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c6787b9..7e0baa5 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2184,6 +2184,7 @@ int cmake::ActualConfigure()
       std::vector<std::string> vsVerions;
       vsVerions.push_back("VisualStudio\\");
       vsVerions.push_back("VCExpress\\");
+      vsVerions.push_back("WDExpress\\");
       struct VSRegistryEntryName
       {
         const char* MSVersion;
@@ -2196,6 +2197,7 @@ int cmake::ActualConfigure()
         {"8.0", "Visual Studio 8 2005"},
         {"9.0", "Visual Studio 9 2008"},
         {"10.0", "Visual Studio 10"},
+        {"11.0", "Visual Studio 11"},
         {0, 0}};
       for(size_t b=0; b < vsVerions.size() && installedCompiler.empty(); b++)
         {

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

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


hooks/post-receive
-- 
CMake