Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into release

This commit is contained in:
Brad King 2015-02-19 09:19:57 -05:00
commit 20f64bd2da
1 changed files with 2 additions and 0 deletions

View File

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