summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hindenburg <[email protected]>2016-06-19 20:19:45 -0400
committerKurt Hindenburg <[email protected]>2016-06-19 20:19:45 -0400
commit92346e9f51e7a5e3a09a9be13fe0d0b291778e01 (patch)
treef9b2d5469c20035f98457bf148d1ee35753657d6
parentc87016ae49e90a6517f2e9ec173c3ff76e2f9c5c (diff)
Depend on ECM 1.6 and use new install variables
-rw-r--r--CMakeLists.txt2
-rw-r--r--data/color-schemes/CMakeLists.txt2
-rw-r--r--data/keyboard-layouts/CMakeLists.txt2
-rw-r--r--desktop/CMakeLists.txt16
-rw-r--r--doc/manual/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt8
6 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 302cd84..3bd15a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/data/color-schemes/CMakeLists.txt b/data/color-schemes/CMakeLists.txt
index 03009e7..0f4f4d3 100644
--- a/data/color-schemes/CMakeLists.txt
+++ b/data/color-schemes/CMakeLists.txt
@@ -15,4 +15,4 @@ install( FILES
Solarized.colorscheme
SolarizedLight.colorscheme
DESTINATION
- ${DATA_INSTALL_DIR}/konsole )
+ ${KDE_INSTALL_DATADIR}/konsole )
diff --git a/data/keyboard-layouts/CMakeLists.txt b/data/keyboard-layouts/CMakeLists.txt
index bdea34b..bf723e7 100644
--- a/data/keyboard-layouts/CMakeLists.txt
+++ b/data/keyboard-layouts/CMakeLists.txt
@@ -7,4 +7,4 @@ install( FILES
solaris.keytab
README.KeyTab
DESTINATION
- ${DATA_INSTALL_DIR}/konsole )
+ ${KDE_INSTALL_DATADIR}/konsole )
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
index 4cc00c4..becad50 100644
--- a/desktop/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -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} )
diff --git a/doc/manual/CMakeLists.txt b/doc/manual/CMakeLists.txt
index af70953..561f034 100644
--- a/doc/manual/CMakeLists.txt
+++ b/doc/manual/CMakeLists.txt
@@ -1,5 +1,5 @@
########### install files ###############
KDOCTOOLS_CREATE_HANDBOOK(index.docbook
- INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
+ INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
SUBDIR konsole)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c066e4..4e117c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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})