Commit bbf5a4d2 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Compose RELEASE_SERVICE_VERSION into kubrick version

Summary:
version was increased to 1.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 relase service version at the end

Reviewers: #kde_games

Subscribers: kde-games-devel

Differential Revision: https://phabricator.kde.org/D27749
parent 6eaa69a9
project (kubrick)
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(kubrick VERSION "1.1.${RELEASE_SERVICE_COMPACT_VERSION}")
set (QT_MIN_VERSION "5.7.0")
set (KF5_MIN_VERSION "5.30.0")
......@@ -27,6 +34,7 @@ find_package(OpenGL REQUIRED)
include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMInstallIcons)
include(ECMSetupVersion)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......
......@@ -16,6 +16,7 @@ set(kubrick_SRCS
scenelabel.cpp
)
ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KUBRICK VERSION_HEADER kubrick_version.h)
ecm_qt_declare_logging_category(kubrick_SRCS HEADER kubrick_debug.h IDENTIFIER KUBRICK_LOG CATEGORY_NAME LOG_KUBRICK)
file(GLOB ICONS_SRCS "*-apps-kubrick.png")
......
......@@ -25,12 +25,11 @@
#include <KLocalizedString>
#include "kubrick.h"
#include "kubrick_version.h"
static const char description [] =
I18N_NOOP ("A game based on Rubik's Cube (TM)");
static const char version [] = "1.1";
int main(int argc, char **argv)
{
QApplication app(argc, argv);
......@@ -38,7 +37,7 @@ int main(int argc, char **argv)
KLocalizedString::setApplicationDomain("kubrick");
KAboutData about (QStringLiteral("kubrick"), i18n ("Kubrick"),
QLatin1String(version), i18n (description),
KUBRICK_VERSION_STRING, i18n (description),
KAboutLicense::GPL,
i18n ("&copy; 2008 Ian Wadham"),
QStringLiteral("https://kde.org/applications/games/org.kde.kubrick") );
......
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