From 750b644f8c4e9d58d66f9501b88e062ee47904f4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 22 Feb 2015 15:46:03 +0100 Subject: [PATCH] Provide version through ecm_setup_version --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 4 ++++ src/danbooru_client.cpp | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f55920..d791716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ set(danbooru_client_VERSION_MAJOR 0) set(danbooru_client_VERSION_MINOR 2) set(danbooru_client_VERSION_PATCH 0) +set (danbooru_VERSION ${danbooru_client_VERSION_MAJOR}.${danbooru_client_VERSION_MINOR}.${danbooru_client_VERSION_PATCH}) + find_package (ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2341385..6f61556 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +include(ECMSetupVersion) + +ecm_setup_version(${danbooru_VERSION} VARIABLE_PREFIX DANBOORU_CLIENT VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/danbooru_version.h) + set(danbooru_client_SRCS danbooruconnectwidget.cpp danboorusearchwidget.cpp diff --git a/src/danbooru_client.cpp b/src/danbooru_client.cpp index 04d37d7..fe95ca4 100644 --- a/src/danbooru_client.cpp +++ b/src/danbooru_client.cpp @@ -26,23 +26,26 @@ #include #include "mainwindow.h" +#include "danbooru_version.h" +#include "libdanbooru/libdanbooru_version.h" int main(int argc, char *argv[]) { QApplication app(argc, argv); QCoreApplication::setApplicationName(QLatin1String("danbooru-client")); - QCoreApplication::setApplicationVersion(QLatin1String("0.1alpha")); + QCoreApplication::setApplicationVersion(QLatin1String(DANBOORU_CLIENT_VERSION_STRING)); QCoreApplication::setOrganizationDomain(QLatin1String("kde.org")); QApplication::setApplicationDisplayName(i18n("Danbooru Client")); + KLocalizedString::setApplicationDomain("danbooru-client"); KAboutData aboutData(I18N_NOOP(QLatin1String("danbooru-client")), i18n("Danbooru Client"), - QLatin1String("0.1alpha"), + QLatin1String(DANBOORU_CLIENT_VERSION_STRING), i18n("KF5 based Danbooru client"), KAboutLicense::GPL_V3, i18n("(C) 2015 Luca Beltrame"), - QString(), + QString("Using libdanbooru version %1").arg(LIBDANBOORU_VERSION_STRING), QLatin1String("https://git.dennogumi.org/kde/danbooru-client") );