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
wilder-portage
Kurt Hindenburg 12 years ago
parent 4739abf934
commit 26e2da0d6b
  1. 7
      CMakeLists.txt
  2. 9
      src/CMakeLists.txt
  3. 2
      src/config-konsole.h.cmake
  4. 2
      src/main.cpp

@ -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

@ -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

@ -8,3 +8,5 @@
#cmakedefine HAVE_OS_DRAGONFLYBSD 1
#cmakedefine01 HAVE_X11
#define KONSOLE_VERSION "${Konsole_VERSION}"

@ -32,8 +32,6 @@
#define KONSOLE_VERSION "2.99.900"
using Konsole::Application;
// fill the KAboutData structure with information about contributors to Konsole.

Loading…
Cancel
Save