diff options
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | applications/kube/main.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cbde180..25dd4242 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -22,10 +22,16 @@ include(KDECompilerSettings) | |||
22 | #Avoid building appstreamtest | 22 | #Avoid building appstreamtest |
23 | set(KDE_SKIP_TEST_SETTINGS true) | 23 | set(KDE_SKIP_TEST_SETTINGS true) |
24 | include(KDECMakeSettings NO_POLICY_SCOPE) | 24 | include(KDECMakeSettings NO_POLICY_SCOPE) |
25 | include(ECMSetupVersion) | ||
26 | |||
27 | ecm_setup_version(PROJECT | ||
28 | SOVERSION kube_VERSION_MAJOR | ||
29 | VERSION_HEADER kube_version.h | ||
30 | ) | ||
25 | 31 | ||
26 | enable_testing() | 32 | enable_testing() |
27 | 33 | ||
28 | include_directories(.) | 34 | include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) |
29 | add_subdirectory(framework) | 35 | add_subdirectory(framework) |
30 | add_subdirectory(components) | 36 | add_subdirectory(components) |
31 | add_subdirectory(icons) | 37 | add_subdirectory(icons) |
diff --git a/applications/kube/main.cpp b/applications/kube/main.cpp index 88e44eac..0c2e5eb7 100644 --- a/applications/kube/main.cpp +++ b/applications/kube/main.cpp | |||
@@ -43,6 +43,7 @@ | |||
43 | 43 | ||
44 | #include <QDebug> | 44 | #include <QDebug> |
45 | #include "framework/src/keyring.h" | 45 | #include "framework/src/keyring.h" |
46 | #include "kube_version.h" | ||
46 | 47 | ||
47 | //Print a demangled stacktrace | 48 | //Print a demangled stacktrace |
48 | void printStacktrace() | 49 | void printStacktrace() |
@@ -178,11 +179,13 @@ int main(int argc, char *argv[]) | |||
178 | 179 | ||
179 | QApplication app(argc, argv); | 180 | QApplication app(argc, argv); |
180 | app.setApplicationName("kube"); | 181 | app.setApplicationName("kube"); |
182 | app.setApplicationVersion(kube_VERSION_STRING); | ||
181 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); | 183 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); |
182 | 184 | ||
183 | QCommandLineParser parser; | 185 | QCommandLineParser parser; |
184 | parser.setApplicationDescription("A communication and collaboration client."); | 186 | parser.setApplicationDescription("A communication and collaboration client."); |
185 | parser.addHelpOption(); | 187 | parser.addHelpOption(); |
188 | parser.addVersionOption(); | ||
186 | parser.addOption({{"k", "keyring"}, | 189 | parser.addOption({{"k", "keyring"}, |
187 | QCoreApplication::translate("main", "To automatically unlock the keyring pass in a keyring in the form of {\"accountId\": {\"resourceId\": \"secret\", *}}"), | 190 | QCoreApplication::translate("main", "To automatically unlock the keyring pass in a keyring in the form of {\"accountId\": {\"resourceId\": \"secret\", *}}"), |
188 | "keyring dictionary"} | 191 | "keyring dictionary"} |