Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Games
lskat
Commits
b481b2bf
Commit
b481b2bf
authored
Nov 14, 2020
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set and make use of RELEASE_SERVICE_VERSION variables
NO_CHANGELOG
parent
18a081dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
CMakeLists.txt
CMakeLists.txt
+15
-2
src/CMakeLists.txt
src/CMakeLists.txt
+5
-0
src/main.cpp
src/main.cpp
+2
-2
No files found.
CMakeLists.txt
View file @
b481b2bf
project
(
lskat
)
cmake_minimum_required
(
VERSION 3.5 FATAL_ERROR
)
# Release Service version, managed by release script
set
(
RELEASE_SERVICE_VERSION_MAJOR
"20"
)
set
(
RELEASE_SERVICE_VERSION_MINOR
"11"
)
set
(
RELEASE_SERVICE_VERSION_MICRO
"80"
)
set
(
RELEASE_SERVICE_COMPACT_VERSION
"
${
RELEASE_SERVICE_VERSION_MAJOR
}${
RELEASE_SERVICE_VERSION_MINOR
}${
RELEASE_SERVICE_VERSION_MICRO
}
"
)
# Bump LSKAT_BASE_VERSION once new features are added
set
(
LSKAT_BASE_VERSION
"1.50"
)
set
(
LSKAT_VERSION
"
${
LSKAT_BASE_VERSION
}
.
${
RELEASE_SERVICE_COMPACT_VERSION
}
"
)
project
(
lskat VERSION
${
LSKAT_VERSION
}
)
set
(
QT_MIN_VERSION
"5.10.0"
)
set
(
KF5_MIN_VERSION
"5.46.0"
)
...
...
@@ -28,6 +40,7 @@ include(KDEInstallDirs)
include
(
KDECompilerSettings NO_POLICY_SCOPE
)
include
(
KDECMakeSettings
)
include
(
ECMQtDeclareLoggingCategory
)
include
(
ECMSetupVersion
)
add_definitions
(
-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS
)
...
...
src/CMakeLists.txt
View file @
b481b2bf
...
...
@@ -25,6 +25,11 @@ set(lskat_SRCS
fromlibkdegames/kcarddialog.cpp
)
ecm_setup_version
(
${
LSKAT_VERSION
}
VARIABLE_PREFIX LSKAT
VERSION_HEADER lskat_version.h
)
ki18n_wrap_ui
(
lskat_SRCS
namedialog.ui
fromlibkdegames/kgamecardselector.ui
...
...
src/main.cpp
View file @
b481b2bf
...
...
@@ -44,6 +44,7 @@
#include "lskat_debug.h"
#include "lskat_version.h"
#include "lskatglobal.h"
#include "mainwindow.h"
...
...
@@ -55,7 +56,6 @@
#include <QCommandLineParser>
#include <QCommandLineOption>
#define LSKAT_VERSION "v1.50"
// Debug level for the program
int
global_debug
=
0
;
...
...
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
KLocalizedString
::
setApplicationDomain
(
"lskat"
);
KAboutData
aboutData
(
QStringLiteral
(
"lskat"
),
i18n
(
"LSkat"
),
LSKAT_VERSION
,
QStringLiteral
(
LSKAT_VERSION
_STRING
)
,
i18n
(
"LSkat: A desktop card game"
),
KAboutLicense
::
GPL
,
i18n
(
"(c) 1995-2007, Martin Heni"
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment