diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-12 10:15:11 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-02-12 10:21:00 -0500 |
| commit | da490e11599e7948bb0a3ed3a53cdf5f80253b2d (patch) | |
| tree | 9d73a61118a1a8be341ced580cdb0efafe562b18 | |
| parent | a5a5a6857241c21d306661d723b749839f4c6e1a (diff) | |
| download | cmake-da490e11599e7948bb0a3ed3a53cdf5f80253b2d.tar.gz | |
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.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d7bec44920..7ffd5af5f2 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() |