diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-16 14:52:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-16 14:52:36 (GMT) |
| commit | a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 (patch) | |
| tree | 69ab88dcdd11d363e3353372fd1a16dc42f3c2f5 /Source | |
| parent | e0a3009cda60c51cefda2f7cb7100786eca2e219 (diff) | |
| parent | da490e11599e7948bb0a3ed3a53cdf5f80253b2d (diff) | |
| download | CMake-a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6.zip CMake-a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6.tar.gz CMake-a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6.tar.bz2 | |
Merge topic 'cmake-gui-reset-generator'
da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959)
Diffstat (limited to 'Source')
| -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 fc8cf06..848028f 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() |