[Cmake-commits] CMake branch, next, updated. v2.8.9-582-g300ea33

[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  300ea33da5c36e276fbaad0939b314c49ee24e0d (commit)
       via  e2160ed4e8928ed3efe87cfda0a475c7d3e4209a (commit)
      from  d2e906db5887a95a3e78e6742f4c0e4b662bc99b (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=300ea33da5c36e276fbaad0939b314c49ee24e0d
commit 300ea33da5c36e276fbaad0939b314c49ee24e0d
Merge: d2e906d e2160ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 14:03:39 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 14:03:39 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2160ed4e8928ed3efe87cfda0a475c7d3e4209a
commit e2160ed4e8928ed3efe87cfda0a475c7d3e4209a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 11:56:14 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 18 11:57:11 2012 -0400

    VS11: Detect VS 2012 Express for default generator (#13348)

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7e0baa5..079ea36 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2199,9 +2199,9 @@ int cmake::ActualConfigure()
         {"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]";
@@ -2210,6 +2210,7 @@ int cmake::ActualConfigure()
           if (!(reg == "/registry"))
             {
             installedCompiler = version[i].GeneratorName;
+            break;
             }
           }
         }

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

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


hooks/post-receive
-- 
CMake