kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2016-02-12 10:15:11 -05:00
parent a5a5a68572
commit da490e1159
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobalGenerator.cxx
View File

@ -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()