From 26e2da0d6bae1d88fb78785ad233e26bdd928eb5 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 14 Sep 2014 08:33:48 -0400 Subject: [PATCH] Version-ize konsoleprivate libraries This allows (on packaging level at least) co-existence of kdelibs4 & KF5 konsole-part. Patch by Hrvoje Senjan hrvoje senjan gmail com REVIEW: 119909 --- CMakeLists.txt | 7 +++++++ src/CMakeLists.txt | 9 ++++++++- src/config-konsole.h.cmake | 2 ++ src/main.cpp | 2 -- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36555400..2030a2ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ # Konsole project project(Konsole) +set(Konsole_VERSION_MAJOR 2) +set(Konsole_VERSION_MINOR 99) +set(Konsole_VERSION_PATCH 900) +set(Konsole_VERSION "${Konsole_VERSION_MAJOR}.${Konsole_VERSION_MINOR}.${Konsole_VERSION_PATCH}") # minimal requirements cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) @@ -19,6 +23,9 @@ include(ECMGenerateHeaders) include(GenerateExportHeader) include(FeatureSummary) +ecm_setup_version(${Konsole_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE + SOVERSION ${Konsole_VERSION_MAJOR} +) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test) find_package(KF5 REQUIRED diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 551a1484..74d2ffe1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,6 +170,13 @@ target_link_libraries(konsoleprivate ${konsole_LIBS} ) target_link_libraries(konsoleprivate LINK_INTERFACE_LIBRARIES ${konsole_LIBS}) +set_target_properties(konsoleprivate PROPERTIES + VERSION ${KONSOLEPRIVATE_VERSION_STRING} + SOVERSION ${KONSOLEPRIVATE_SOVERSION} +) + +install(TARGETS konsoleprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) + set(konsole_KDEINIT_SRCS Application.cpp MainWindow.cpp @@ -188,7 +195,7 @@ target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::WindowSyst KF5::NotifyConfig ) -install(TARGETS kdeinit_konsole konsole konsoleprivate +install(TARGETS kdeinit_konsole konsole ${INSTALL_TARGETS_DEFAULT_ARGS}) ### Embedded Konsole KPart diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake index 2860d68a..2c71b47c 100644 --- a/src/config-konsole.h.cmake +++ b/src/config-konsole.h.cmake @@ -8,3 +8,5 @@ #cmakedefine HAVE_OS_DRAGONFLYBSD 1 #cmakedefine01 HAVE_X11 + +#define KONSOLE_VERSION "${Konsole_VERSION}" \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 955e028c..eb07ec5a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,8 +32,6 @@ -#define KONSOLE_VERSION "2.99.900" - using Konsole::Application; // fill the KAboutData structure with information about contributors to Konsole.