Browse Source

Merge topic 'cmake-gui-reset-generator'

da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959)
Brad King 9 years ago
parent
commit
a64fa04b4b
1 changed files with 7 additions and 0 deletions
  1. 7 0
      Source/cmGlobalGenerator.cxx

+ 7 - 0
Source/cmGlobalGenerator.cxx

@@ -86,6 +86,13 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->TryCompileOuterMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
 
   this->ConfigureDoneCMP0026AndCMP0024 = false;
   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()
 cmGlobalGenerator::~cmGlobalGenerator()