Add source version

.appveyor.yml

@@ -2,22 +2,22 @@ image:
   - Ubuntu1604
   - Visual Studio 2019
 install:
+  - git submodule update --init --recursive
   - cmd: set QTDIR=C:\Qt\5.15\mingw81_32
   - cmd: set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw810_32\bin;%PATH%;
   - sh: export DEBIAN_FRONTEND=noninteractive
   - sh: ./ci/install-qt-dependencies.sh
   - sh: ./ci/install-linuxdeployqt.sh $HOME/bin
-  - sh: export PATH="$HOME/Qt/5.15.2/gcc_64/bin:$HOME/bin:$PATH"
+  - sh: export QTDIR="$HOME/Qt/5.15.2/gcc_64"
+  - sh: export PATH="$QTDIR/bin:$HOME/bin:$PATH"
 build_script:
-  - qmake BluePassServer.pro
-  - cmd: mingw32-make
-  - sh: make -j 4
+  - cmd: cmake -G "Ninja" -DQt5_DIR=%QTDIR%\lib\Qt5 .
+  - sh: cmake -G "Ninja" -DQt5_DIR=$QTDIR/lib/cmake/Qt5 .
+  - ninja
 after_build:
-  - cmd: windeployqt release/BluePassServer.exe
-  - cmd: rm release/*.o
-  - cmd: rm release/*.cpp
-  - cmd: rm release/*.h
-  - cmd: mv release bluepass-server-win32
+  - cmd: mkdir bluepass-server-win32
+  - cmd: cp BluePassServer.exe bluepass-server-win32/
+  - cmd: windeployqt bluepass-server-win32/BluePassServer.exe
   - sh: mkdir bluepass-server-linux
   - sh: cp BluePassServer bluepass-server-linux/
   - sh: VERSION=${APPVEYOR_REPO_TAG_NAME} ./ci/package-appimage-linux.sh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "modules/c_git_version"]
+	path = modules/c_git_version
+	url = https://github.com/boon-code/c-git-version.git

CMakeLists.txt

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+
+project(BluePassServer LANGUAGES CXX)
+
+option(HAS_VERSION "The project includes versioning information" ON)
+if(HAS_VERSION)
+    add_subdirectory(modules/c_git_version)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt5
+    COMPONENTS Core Gui Widgets Bluetooth
+    REQUIRED
+)
+
+add_compile_options(-Wall -Wextra -Wpedantic)
+
+add_executable(BluePassServer
+    app_constants.h
+    bluetooth_device_list_model.cpp
+    bluetooth_device_list_model.h
+    bluetooth_service.cpp
+    bluetooth_service.h
+    choose_adapter_dialog.cpp
+    choose_adapter_dialog.h
+    dashboard.cpp
+    dashboard.h
+    main.cpp
+    main_app.cpp
+    main_app.h
+    settings.cpp
+    settings.h
+    settings_type.cpp
+    settings_type.h
+    bpserver.qrc
+    choose_adapter_dialog.ui
+    dashboard.ui
+)
+
+target_include_directories(BluePassServer PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+target_compile_definitions(BluePassServer PRIVATE
+    -DQT_DEPRECATED_WARNINGS=1
+    -DQT_DISABLE_DEPRECATED_BEFORE=0xFFFFFF
+)
+
+if(HAS_VERSION)
+    target_compile_definitions(BluePassServer PRIVATE -DHAS_VERSION=1)
+    target_link_libraries(BluePassServer c_git_version)
+endif()
+
+target_link_libraries(BluePassServer
+    Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Bluetooth
+)
+
+set_property(TARGET BluePassServer PROPERTY CXX_STANDARD 11)

dashboard.cpp

@@ -7,6 +7,9 @@
 #include <QDebug>
 #include <QBluetoothLocalDevice>
 #include <QClipboard>
+#ifdef HAS_VERSION
+#include "c_git_version.h"
+#endif
 
 #define MAX_DISCOVERABLE_TIME_MS 60000
 
@@ -29,6 +32,7 @@ Dashboard::Dashboard(Settings *settings, QWidget *parent) :
     bt_service_started_(false)
 {
     ui->setupUi(this);
+    setTitle();
     updateSettingsView();
     setupTray();
     on_configurationChanged(current_settings_);
@@ -226,6 +230,15 @@ void Dashboard::updateTrayIcon()
     }
 }
 
+void Dashboard::setTitle()
+{
+#ifdef HAS_VERSION
+    this->setWindowTitle(QString("BluePassServer %1").arg(c_git_version()));
+#else
+    this->setWindowTitle("BluePassServer");
+#endif
+}
+
 void Dashboard::on_dbbOkCancel_accepted()
 {
     settings_->updateSettings(current_settings_);

dashboard.h

@@ -54,6 +54,7 @@ private slots:
     void copyToClipboard(const QString& code);
     void updateDiscoverableText();
     void updateTrayIcon();
+    void setTitle();
 
 private:
     Ui::Dashboard *ui;

main_app.cpp

@@ -3,6 +3,9 @@
 #include <QCoreApplication>
 #include <QDebug>
 
+#ifdef HAS_VERSION
+#include "c_git_version.h"
+#endif
 
 MainApp::MainApp(QObject *parent)
     : QObject(parent),
@@ -55,4 +58,13 @@ void MainApp::setOrganizationFields()
     QCoreApplication::setOrganizationName(ORG_NAME);
     QCoreApplication::setOrganizationDomain(ORG_NAME);
     QCoreApplication::setApplicationName(APP_NAME);
+
+#ifdef HAS_VERSION
+    QCoreApplication::setApplicationVersion(c_git_version());
+
+    qDebug() << "Version: " << c_git_version();
+    qDebug() << "Branch: " << c_git_branch();
+    qDebug() << "Hash: " << c_git_hash();
+    qDebug() << "Submodules: " << c_git_submodules();
+#endif
 }