[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-396-g1c6b43d

[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  1c6b43d80fe151145e68ed1f718b31705abb1537 (commit)
       via  bf86012ada901386dbf5545fdc820e81f3e6bf92 (commit)
      from  67c528c03d2c598e4922f932c5598d5da91bc408 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c6b43d80fe151145e68ed1f718b31705abb1537
commit 1c6b43d80fe151145e68ed1f718b31705abb1537
Merge: 67c528c bf86012
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 11 08:41:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 11 08:41:56 2016 -0400

    Merge topic 'cmake-gui-fix-extra-generator-names' into next
    
    bf86012a cmake-gui: Fix "extra" generator entries in drop-down list


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf86012ada901386dbf5545fdc820e81f3e6bf92
commit bf86012ada901386dbf5545fdc820e81f3e6bf92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 11 08:35:11 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 11 08:39:44 2016 -0400

    cmake-gui: Fix "extra" generator entries in drop-down list
    
    Refactoring in commit v3.7.0-rc1~291^2~1 (Refactor extra generator
    registration to use factories, 2016-07-20) accidentally switched
    the order of the "extra - base" generator names to "base - extra".
    Switch it back.  While this could affect all callers of the
    `GetRegisteredGenerators` method, only cmake-gui actually used this
    particular field.
    
    Closes: #16359

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 14124f8..c8cf465 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -929,7 +929,7 @@ void cmake::GetRegisteredGenerators(
          gen != genList.end(); ++gen) {
       GeneratorInfo info;
       info.name = cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
-        (*i)->GetName(), *gen);
+        *gen, (*i)->GetName());
       info.baseName = *gen;
       info.extraName = (*i)->GetName();
       info.supportsPlatform = false;

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

Summary of changes:
 Source/cmake.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake