[Cmake-commits] CMake branch, next, updated. v2.8.9-584-gf5cb882

[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  f5cb882c8d8bb99927d084d69b1c29cfdcb23e03 (commit)
       via  e17f3458ce8c5eaba53dc00d273d3456746c7fd4 (commit)
      from  300ea33da5c36e276fbaad0939b314c49ee24e0d (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=f5cb882c8d8bb99927d084d69b1c29cfdcb23e03
commit f5cb882c8d8bb99927d084d69b1c29cfdcb23e03
Merge: 300ea33 e17f345
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 14:04:07 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 14:04:07 2012 -0400

    Merge topic 'vs11-express' into next
    
    e17f345 VS11: Detect VS 2012 Express for default generator (#13348)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e17f3458ce8c5eaba53dc00d273d3456746c7fd4
commit e17f3458ce8c5eaba53dc00d273d3456746c7fd4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Sep 16 00:01:32 2012 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 18 14:02:01 2012 -0400

    VS11: Detect VS 2012 Express for default generator (#13348)
    
    Add WDExpress to the list of registry search locations.  Add VS 11 to
    the list of VS versions and corresponding generator names.  Fix the
    search logic to use the most recent version found under any registry
    entry.
    
    Inspired-by: Peter Kümmel <syntheticpp at gmx.net>

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c6787b9..079ea36 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,10 +2197,11 @@ 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++)
+      for(int i=0; version[i].MSVersion != 0; i++)
         {
-        for(int i =0; version[i].MSVersion != 0; i++)
+        for(size_t b=0; b < vsVerions.size(); b++)
           {
           std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
           reg += ";InstallDir]";
@@ -2208,6 +2210,7 @@ int cmake::ActualConfigure()
           if (!(reg == "/registry"))
             {
             installedCompiler = version[i].GeneratorName;
+            break;
             }
           }
         }

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

Summary of changes:


hooks/post-receive
-- 
CMake