diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-13 13:36:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-13 13:36:08 (GMT) |
| commit | 5ef2bb4b86c16fc5d5e2a2b4de1b647c9007f8bf (patch) | |
| tree | 7a54eb24955e5402f3032b4b59dc42afc309bbef /Source | |
| parent | e1a671c7d821e3e240fc2eaf60b0572c8aed31e6 (diff) | |
| parent | ae32622bcfe4aee667b749f89e61d9a4fe44c762 (diff) | |
| download | CMake-5ef2bb4b86c16fc5d5e2a2b4de1b647c9007f8bf.zip CMake-5ef2bb4b86c16fc5d5e2a2b4de1b647c9007f8bf.tar.gz CMake-5ef2bb4b86c16fc5d5e2a2b4de1b647c9007f8bf.tar.bz2 | |
Merge topic 'string-apis-fix-cmake-gui'
ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 12da320..5f9ebaf 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -117,7 +117,7 @@ void QCMake::setBinaryDirectory(const QString& _dir) { const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR"); std::string curGen = cmExternalMakefileProjectGenerator:: - CreateFullGeneratorName(itm.GetValue(), extraGen); + CreateFullGeneratorName(itm.GetValue(), extraGen? extraGen : ""); this->setGenerator(QString::fromLocal8Bit(curGen.c_str())); } } |