Commit 665e5fe7 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Compose RELEASE_SERVICE_VERSION into knavalbattle version number

Summary:
version was increased to 2.1 "recently" and not so many changes have been done since them
so asserting the verison number is stuck in the past is a bit too much, but still having it move with
each new release is important for reproducibility of issues, etc. so compromise and append the version at the end

Reviewers: #kde_games

Subscribers: kde-games-devel

Differential Revision: https://phabricator.kde.org/D27754
parent 725cb4d7
project(knavalbattle)
cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
set (RELEASE_SERVICE_VERSION_MAJOR "20")
set (RELEASE_SERVICE_VERSION_MINOR "03")
set (RELEASE_SERVICE_VERSION_MICRO "70")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}")
project(knavalbattle VERSION "2.1.${RELEASE_SERVICE_COMPACT_VERSION}")
set (QT_MIN_VERSION "5.7.0")
set (KF5_MIN_VERSION "5.30.0")
......@@ -24,6 +31,7 @@ find_package(KF5KDEGames 4.9.0 REQUIRED)
include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMInstallIcons)
include(ECMSetupVersion)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......
......@@ -39,6 +39,7 @@ set(knavalbattle_SRCS
welcomescreen.cpp
)
ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KNAVALBATTLE VERSION_HEADER knavalbattle_version.h)
ecm_qt_declare_logging_category(knavalbattle_SRCS HEADER knavalbattle_debug.h IDENTIFIER KNAVALBATTLE_LOG CATEGORY_NAME org.kde.kdegames.knavalbattle)
kconfig_add_kcfg_files(knavalbattle_SRCS settingsbase.kcfgc)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/*-apps-knavalbattle.png")
......
......@@ -24,6 +24,7 @@
#include "mainwindow.h"
#include "coord.h"
#include "statswidget.h"
#include "knavalbattle_version.h"
int main(int argc, char** argv)
{
......@@ -35,7 +36,7 @@ int main(int argc, char** argv)
migrate.setUiFiles(QStringList() << QStringLiteral("knavalbattleui.rc"));
migrate.migrate();
KAboutData aboutData(QStringLiteral("knavalbattle"), i18n("Naval Battle"), QStringLiteral("2.1"),
KAboutData aboutData(QStringLiteral("knavalbattle"), i18n("Naval Battle"), KNAVALBATTLE_VERSION_STRING,
i18n("The KDE ship sinking game"), KAboutLicense::GPL,
i18n("(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin\n"
"(c) 2007 Paolo Capriotti"), QString(), QStringLiteral("https://kde.org/applications/games/org.kde.kbattleship") );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment