diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-19 09:19:57 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-19 09:19:57 -0500 |
| commit | 20f64bd2dadbfe740e76d627523adf2161a515f3 (patch) | |
| tree | eb17c1230ad72092823a0fed25560d31f29b1738 | |
| parent | 05e4fc6b2a664dee4229742577cf4d065ecec713 (diff) | |
| parent | 1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (diff) | |
| download | cmake-20f64bd2dadbfe740e76d627523adf2161a515f3.tar.gz | |
Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into release
| -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); |