diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-20 13:10:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-20 13:10:48 (GMT) |
| commit | b7351d8e14ea7cc05b0c5d45dae48a21aef298c1 (patch) | |
| tree | 6f70c09f84c3c3e04d8e251afc1e41b3b4cb0a7f | |
| parent | 14713eebfb3152bb7b3591515da5780b4eec1dd3 (diff) | |
| parent | 1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (diff) | |
| download | CMake-b7351d8e14ea7cc05b0c5d45dae48a21aef298c1.zip CMake-b7351d8e14ea7cc05b0c5d45dae48a21aef298c1.tar.gz CMake-b7351d8e14ea7cc05b0c5d45dae48a21aef298c1.tar.bz2 | |
Merge topic 'cmake-gui-reset-generator-toolset-and-platform'
1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)
| -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 b833648..996aa75 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); |