Commit 52371ca4 authored by Albert Astals Cid's avatar Albert Astals Cid

Compose RELEASE_SERVICE_VERSION into palapeli version

Summary:
Palapeli 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/D27748
parent 1c1e3157
project(palapeli)
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(palapeli VERSION "2.1.${RELEASE_SERVICE_COMPACT_VERSION}")
set (QT_MIN_VERSION "5.9.0")
set (KF5_MIN_VERSION "5.46.0")
......@@ -31,6 +38,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)
......
......@@ -45,6 +45,7 @@ set(palapeli_SRCS
window/pieceholder.cpp
)
ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX PALAPELI VERSION_HEADER palapeli_version.h)
ecm_qt_declare_logging_category(palapeli_SRCS HEADER palapeli_debug.h IDENTIFIER PALAPELI_LOG CATEGORY_NAME org.kde.palapeli)
kconfig_add_kcfg_files(palapeli_SRCS settings.kcfgc)
......
......@@ -18,6 +18,7 @@
#include "importhelper.h"
#include "window/mainwindow.h"
#include "palapeli_version.h"
#include <ctime>
#include <KAboutData>
......@@ -34,7 +35,7 @@ int main(int argc, char** argv)
KLocalizedString::setApplicationDomain("palapeli");
KAboutData about(QStringLiteral("palapeli"), i18nc("The application's name", "Palapeli"), QStringLiteral("2.1"), i18n("KDE Jigsaw Puzzle Game"), KAboutLicense::GPL, i18n("Copyright 2009, 2010, Stefan Majewsky"));
KAboutData about(QStringLiteral("palapeli"), i18nc("The application's name", "Palapeli"), PALAPELI_VERSION_STRING, i18n("KDE Jigsaw Puzzle Game"), KAboutLicense::GPL, i18n("Copyright 2009, 2010, Stefan Majewsky"));
about.addAuthor(i18n("Stefan Majewsky"), QString(), QStringLiteral("majewsky@gmx.net"), QStringLiteral("https://majewsky.wordpress.com/"));
about.addCredit (i18n ("Johannes Loehnert"),
i18n ("The option to preview the completed puzzle"),
......
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