Merge topic 'string-apis-fix-cmake-gui'

ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
This commit is contained in:
Brad King 2014-03-13 09:36:08 -04:00 committed by CMake Topic Stage
commit 5ef2bb4b86
1 changed files with 1 additions and 1 deletions

View File

@ -117,7 +117,7 @@ void QCMake::setBinaryDirectory(const QString& _dir)
{ {
const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR"); const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
std::string curGen = cmExternalMakefileProjectGenerator:: std::string curGen = cmExternalMakefileProjectGenerator::
CreateFullGeneratorName(itm.GetValue(), extraGen); CreateFullGeneratorName(itm.GetValue(), extraGen? extraGen : "");
this->setGenerator(QString::fromLocal8Bit(curGen.c_str())); this->setGenerator(QString::fromLocal8Bit(curGen.c_str()));
} }
} }