Commit 92346e9f authored by Kurt Hindenburg's avatar Kurt Hindenburg

Depend on ECM 1.6 and use new install variables

parent c87016ae
......@@ -12,7 +12,7 @@ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set (QT_MIN_VERSION "5.2.0")
set (KF5_MIN_VERSION "5.6.0")
find_package(ECM 1.2.0 REQUIRED NO_MODULE)
find_package(ECM 1.6.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
......
......@@ -15,4 +15,4 @@ install( FILES
Solarized.colorscheme
SolarizedLight.colorscheme
DESTINATION
${DATA_INSTALL_DIR}/konsole )
${KDE_INSTALL_DATADIR}/konsole )
......@@ -7,4 +7,4 @@ install( FILES
solaris.keytab
README.KeyTab
DESTINATION
${DATA_INSTALL_DIR}/konsole )
${KDE_INSTALL_DATADIR}/konsole )
......@@ -2,11 +2,11 @@
########### install files ###############
install( PROGRAMS org.kde.konsole.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES org.kde.konsole.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR} )
install( FILES terminalemulator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES konsolepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES konsolehere.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
install( FILES konsolerun.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
install( FILES konsole.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
install( PROGRAMS org.kde.konsole.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES org.kde.konsole.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
install( FILES terminalemulator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
install( FILES konsolepart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES konsolehere.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus )
install( FILES konsolerun.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus )
install( FILES konsole.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
########### install files ###############
KDOCTOOLS_CREATE_HANDBOOK(index.docbook
INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
SUBDIR konsole)
......@@ -153,7 +153,7 @@ set_target_properties(konsoleprivate PROPERTIES
SOVERSION ${KONSOLEPRIVATE_SOVERSION}
)
install(TARGETS konsoleprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS konsoleprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
set(konsole_KDEINIT_SRCS
Application.cpp
......@@ -176,7 +176,7 @@ target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::WindowSyst
)
install(TARGETS kdeinit_konsole konsole
${INSTALL_TARGETS_DEFAULT_ARGS})
${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
### Embedded Konsole KPart
......@@ -186,8 +186,8 @@ add_library(konsolepart MODULE ${konsolepart_PART_SRCS})
generate_export_header(konsolepart BASE_NAME konsole)
set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
target_link_libraries(konsolepart KF5::Parts KF5::XmlGui konsoleprivate)
install(TARGETS konsolepart DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS konsolepart DESTINATION ${KDE_INSTALL_PLUGINDIR})
### konsoleprofile command-line tool
install(PROGRAMS konsoleprofile DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS konsoleprofile DESTINATION ${KDE_INSTALL_BINDIR})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment