diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2016-11-02 13:39:04 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2016-11-08 16:36:46 +0800 |
| commit | d808f9446ac54768b13b1f9abd4ec7a93cadcb6f (patch) | |
| tree | aa7febeae696ed59e6809f1c2d9d36aaf7c35cc1 | |
| parent | 9f420ea4b90160b30568be30b3c00f5c5039034d (diff) | |
| download | fqterm-d808f9446ac54768b13b1f9abd4ec7a93cadcb6f.tar.xz | |
only set FQTERM_GIT_REVISION when in git repository
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/ui/aboutdialog.cpp | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a6068ae..87cd721 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(fqterm) -set(FQTERM_VERSION "0.9.8") +set(FQTERM_VERSION "0.9.8.4") set(CMAKE_VERBOSE_MAKEFILE ON) cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) @@ -16,7 +16,11 @@ set(CMAKE_COLOR_MAKEFILE ON) include(GetGitRevisionDescription) git_describe(MCGGIT_WC_REVISION) -message("Git revision: " ${MCGGIT_WC_REVISION}) +IF(MCGGIT_WC_REVISION MATCHES "NOTFOUND") + message("Version: " ${FQTERM_VERSION}) +ELSE(MCGGIT_WC_REVISION MATCHES "NOTFOUND") + message("Git revision: " ${MCGGIT_WC_REVISION}) +ENDIF(MCGGIT_WC_REVISION MATCHES "NOTFOUND") SET(USE_QT5 OFF CACHE PATH "Do the Qt5 build") diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index f522b03..c42c262 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -130,7 +130,9 @@ add_dependencies(fqterm_ui fqterm_utilities ) -ADD_DEFINITIONS(-D "FQTERM_GIT_REVISION=\\\"${MCGGIT_WC_REVISION}\\\"") +IF(NOT MCGGIT_WC_REVISION MATCHES "NOTFOUND") + ADD_DEFINITIONS(-D "FQTERM_GIT_REVISION=\\\"${MCGGIT_WC_REVISION}\\\"") +ENDIF(NOT MCGGIT_WC_REVISION MATCHES "NOTFOUND") if(USE_QT5) target_link_libraries(fqterm_ui Qt5::Core Qt5::Widgets) diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index bd2635f..9fcd0ce 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -52,7 +52,11 @@ aboutDialog::aboutDialog(QWidget *parent, Qt::WindowFlags fl) ui_.TextBrowser->setPlainText(line); file.close(); } - QString aboutText = "FQTerm " + QString(FQTERM_VERSION_STRING) + QString("\ngit revision ") + QString(FQTERM_GIT_REVISION) + QString("\n Built with Qt") + QT_VERSION_STR + QString("\n Running with Qt ") + qVersion(); + QString aboutText = "FQTerm " + QString(FQTERM_VERSION_STRING) +#ifdef FQTERM_GIT_REVISION + + QString("\ngit revision ") + QString(FQTERM_GIT_REVISION) +#endif + + QString("\n Built with Qt") + QT_VERSION_STR + QString("\n Running with Qt ") + qVersion(); ui_.TextLabel->setText(aboutText); } |