summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-03 23:12:16 +0100
committerMontel Laurent <[email protected]>2015-03-03 23:12:16 +0100
commitc0e6830fa97988bccc12adddca2eada061f61b2a (patch)
treeed26cd6b05cd0b4389de9fc8f78f8bd423698a41
parent1569eb883c2ed2d57d90a37554389c8f22a48b2b (diff)
Use new KDE_ macro
-rw-r--r--CMakeLists.txt17
-rw-r--r--doc/CMakeLists.txt2
2 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c488112..bc0b39b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(kcalc)
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set (QT_MIN_VERSION "5.2.0")
-find_package (ECM 1.3.0 REQUIRED NO_MODULE)
+find_package (ECM 1.7.0 REQUIRED NO_MODULE)
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
add_definitions(-DTRANSLATION_DOMAIN="kcalc")
@@ -13,6 +13,7 @@ include(KDECompilerSettings)
include(KDECMakeSettings)
include(ECMMarkAsTest)
include(FeatureSummary)
+include(ECMAddAppIcon)
find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Core
@@ -105,18 +106,18 @@ target_link_libraries(kdeinit_kcalc
${MPFR_LIBRARIES}
)
-install(TARGETS kdeinit_kcalc ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeinit_kcalc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
target_link_libraries( kcalc kdeinit_kcalc )
-install(TARGETS kcalc ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kcalc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
-install( PROGRAMS org.kde.kcalc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES kcalc.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-install( FILES kcalcui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kcalc)
-install( FILES scienceconstants.xml DESTINATION ${DATA_INSTALL_DIR}/kcalc)
-install( FILES kcalcrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
+install( PROGRAMS org.kde.kcalc.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install( FILES kcalc.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install( FILES kcalcui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kcalc)
+install( FILES scienceconstants.xml DESTINATION ${KDE_INSTALL_DATADIR}/kcalc)
+install( FILES kcalcrc.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update)
add_subdirectory(doc)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a6acff7..65fe4de 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcalc)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcalc)