[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-126-g1c6bc3a

[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  1c6bc3adaa84f5fb311f57e193e180530ea84702 (commit)
       via  da490e11599e7948bb0a3ed3a53cdf5f80253b2d (commit)
      from  3a8af0c5b500b6c08d7c4b47d4f9345c04d56aeb (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=1c6bc3adaa84f5fb311f57e193e180530ea84702
commit 1c6bc3adaa84f5fb311f57e193e180530ea84702
Merge: 3a8af0c da490e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 12 10:22:22 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 12 10:22:22 2016 -0500

    Merge topic 'cmake-gui-reset-generator' into next
    
    da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da490e11599e7948bb0a3ed3a53cdf5f80253b2d
commit da490e11599e7948bb0a3ed3a53cdf5f80253b2d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 12 10:15:11 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 12 10:21:00 2016 -0500

    cmake-gui: Fix cmState initialization when changing generators (#15959)
    
    Refactoring in commit v3.3.0-rc1~29^2~1 (cmState: Host some state from
    the cmGlobalGenerator, 2015-05-24) moved storage of some generator
    traits over to cmState.  However, it accidentally removed initialization
    of the values from the cmGlobalGenerator constructor.  This is needed
    because generator subclasses update the settings in their constructors.
    Since a single cmState instance is shared across multiple build trees by
    cmake-gui, initializing the values in its constructor is not enough.
    Fix this by restoring the needed initializations to the
    cmGlobalGenerator constructor.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d7bec44..7ffd5af 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -86,6 +86,13 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->TryCompileOuterMakefile = 0;
 
   this->ConfigureDoneCMP0026AndCMP0024 = false;
+
+  cm->GetState()->SetMinGWMake(false);
+  cm->GetState()->SetMSYSShell(false);
+  cm->GetState()->SetNMake(false);
+  cm->GetState()->SetWatcomWMake(false);
+  cm->GetState()->SetWindowsShell(false);
+  cm->GetState()->SetWindowsVSIDE(false);
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake