summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-12 10:22:31 -0500
committerBrad King <brad.king@kitware.com>2016-02-12 10:22:31 -0500
commit2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09 (patch)
treef627997125b542d87eb3d708588a396204281aa6
parent3e966ef734230848cf834fc444dc2695a07ff398 (diff)
parentda490e11599e7948bb0a3ed3a53cdf5f80253b2d (diff)
downloadcmake-2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09.tar.gz
Merge branch 'cmake-gui-reset-generator' into release
-rw-r--r--Source/cmGlobalGenerator.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index fc8cf06529..848028ff31 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()