summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-16 14:52:36 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-02-16 14:52:36 (GMT)
commita64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 (patch)
tree69ab88dcdd11d363e3353372fd1a16dc42f3c2f5 /Source/cmGlobalGenerator.cxx
parente0a3009cda60c51cefda2f7cb7100786eca2e219 (diff)
parentda490e11599e7948bb0a3ed3a53cdf5f80253b2d (diff)
downloadCMake-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/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx7
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()