From 715d729ba982a79f0ae8ed7830e6556110d2bc25 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 16 May 2017 11:25:10 +0200 Subject: [PATCH] Use git version in the application. --- linphone-desktop/CMakeLists.txt | 4 +++- linphone-desktop/src/app/App.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index 4671fb0b2..0c3adca4d 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################################################ cmake_minimum_required(VERSION 3.1) -project(linphoneqt) +project(linphoneqt VERSION 3.9.0) set(EXECUTABLE_NAME linphone) set(TARGET_NAME linphone-qt) @@ -262,6 +262,8 @@ if(WIN32) else() add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS} ${RESOURCES}) endif() + bc_git_version(${TARGET_NAME} ${PROJECT_VERSION}) + add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-version) add_dependencies(${TARGET_NAME} update_translations) if(NOT WIN32) add_dependencies(update_translations check_qml) diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index 392099e19..0dccc5b9f 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -37,6 +37,7 @@ #include "translator/DefaultTranslator.hpp" #include "App.hpp" +#include "gitversion.h" #define DEFAULT_LOCALE "en" @@ -52,8 +53,8 @@ #define SELF_TEST_DELAY 60000 -#ifndef LINPHONE_VERSION - #define LINPHONE_VERSION "unknown" +#ifndef LINPHONE_QT_GIT_VERSION + #define LINPHONE_QT_GIT_VERSION "unknown" #endif // ifndef LINPHONE_VERSION using namespace std; @@ -65,7 +66,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc } App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { - setApplicationVersion(LINPHONE_VERSION); + setApplicationVersion(LINPHONE_QT_GIT_VERSION); setWindowIcon(QIcon(WINDOW_ICON_PATH)); // List available locales.