diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-19 09:09:58 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-19 09:14:38 -0500 |
| commit | 1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (patch) | |
| tree | 73cd68bdfaea0f0a7331c16b2dfa7fca4512f13e | |
| parent | da92cdab5206d0556822ee12350636300ec73160 (diff) | |
| download | cmake-1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf.tar.gz | |
cmake-gui: Reset generator platform and toolset on configure (#15411)
At the start of each configure step we already reset the generator
selection (CMAKE_GENERATOR) to match that loaded for the current
project. Add missing code to reset the generator platform and toolset
(CMAKE_GENERATOR_PLATFORM and CMAKE_GENERATOR_TOOLSET) also so that they
do not leak across projects.
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index b833648c30..996aa75fef 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -147,6 +147,8 @@ void QCMake::configure() this->CMakeInstance->SetStartOutputDirectory(this->BinaryDirectory.toLocal8Bit().data()); this->CMakeInstance->SetGlobalGenerator( this->CMakeInstance->CreateGlobalGenerator(this->Generator.toLocal8Bit().data())); + this->CMakeInstance->SetGeneratorPlatform(""); + this->CMakeInstance->SetGeneratorToolset(""); this->CMakeInstance->LoadCache(); this->CMakeInstance->SetSuppressDevWarnings(this->SuppressDevWarnings); this->CMakeInstance->SetWarnUninitialized(this->WarnUninitializedMode); |