summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-03-04 06:52:20 (GMT)
committerMontel Laurent <montel@kde.org>2015-03-04 06:52:20 (GMT)
commit5e984303a49911db651c3601f461172e9a3f6410 (patch)
tree9893d305e3a9d290b667293cd9cf846470ededf2
parentf847d716a00a597c53d0f75b8668a34294f4440e (diff)
Use new KDE_ macro
-rw-r--r--CMakeLists.txt23
-rw-r--r--active/app/CMakeLists.txt4
-rw-r--r--active/app/src/CMakeLists.txt2
-rw-r--r--active/components/CMakeLists.txt4
-rw-r--r--doc/CMakeLists.txt4
-rw-r--r--generators/chm/CMakeLists.txt6
-rw-r--r--generators/chm/kio-msits/CMakeLists.txt4
-rw-r--r--generators/comicbook/CMakeLists.txt6
-rw-r--r--generators/djvu/CMakeLists.txt6
-rw-r--r--generators/dvi/CMakeLists.txt6
-rw-r--r--generators/epub/CMakeLists.txt6
-rw-r--r--generators/epub/data/CMakeLists.txt2
-rw-r--r--generators/fax/CMakeLists.txt6
-rw-r--r--generators/fictionbook/CMakeLists.txt8
-rw-r--r--generators/kimgio/CMakeLists.txt6
-rw-r--r--generators/mobipocket/CMakeLists.txt6
-rw-r--r--generators/ooo/CMakeLists.txt6
-rw-r--r--generators/plucker/CMakeLists.txt6
-rw-r--r--generators/poppler/CMakeLists.txt6
-rw-r--r--generators/poppler/conf/CMakeLists.txt2
-rw-r--r--generators/spectre/CMakeLists.txt8
-rw-r--r--generators/spectre/conf/CMakeLists.txt2
-rw-r--r--generators/tiff/CMakeLists.txt6
-rw-r--r--generators/txt/CMakeLists.txt6
-rw-r--r--generators/xps/CMakeLists.txt6
-rw-r--r--shell/CMakeLists.txt6
-rw-r--r--ui/data/CMakeLists.txt10
-rw-r--r--ui/data/icons/CMakeLists.txt2
28 files changed, 83 insertions, 82 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb118c3..56c9976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ include(ECMSetupVersion)
include(ECMOptionalAddSubdirectory)
include(GenerateExportHeader)
include(FeatureSummary)
+include(ECMAddAppIcon)
include(KDEFrameworkCompilerSettings)
include(KDEInstallDirs)
include(KDECMakeSettings)
@@ -159,7 +160,7 @@ install( FILES
core/observer.h
${CMAKE_CURRENT_BINARY_DIR}/okularcore_export.h
${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/okular/core COMPONENT Devel)
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel)
install( FILES
interfaces/configinterface.h
@@ -167,7 +168,7 @@ install( FILES
interfaces/printinterface.h
interfaces/saveinterface.h
interfaces/viewerinterface.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/okular/interfaces COMPONENT Devel)
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/interfaces COMPONENT Devel)
ki18n_wrap_ui(okularcore_SRCS
core/chooseenginewidget.ui
@@ -204,11 +205,11 @@ endif(LibKScreen_FOUND)
set_target_properties(okularcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )
-install(TARGETS okularcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS okularcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
-install(FILES conf/okular.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-install(FILES conf/okular_core.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-install(FILES core/okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+install(FILES conf/okular.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install(FILES core/okularGenerator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
# okularpart
@@ -289,15 +290,15 @@ target_link_libraries(okularpart okularcore Qt5::Svg KF5::Parts ${MATH_LIB} Phon
if (Qt5TextToSpeech_FOUND)
target_link_libraries(okularpart Qt5::TextToSpeech)
endif()
-install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install(FILES okular.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
+install(FILES okular.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update)
-install( FILES okular_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES part.rc part-viewermode.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/okular )
+install( FILES okular_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES part.rc part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
########### cmake files #################
@@ -306,7 +307,7 @@ write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OkularConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake
- DESTINATION ${LIB_INSTALL_DIR}/cmake/Okular )
+ DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/Okular )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/active/app/CMakeLists.txt b/active/app/CMakeLists.txt
index 8c27bb7..662fdc2 100644
--- a/active/app/CMakeLists.txt
+++ b/active/app/CMakeLists.txt
@@ -4,8 +4,8 @@ include_directories( ${QT_INCLUDES} )
add_subdirectory(src)
# QML-only thing
-install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/packages/org.kde.active.documentviewer)
+install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/plasma/packages/org.kde.active.documentviewer)
-install(FILES active-documentviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES active-documentviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/active/app/src/CMakeLists.txt b/active/app/src/CMakeLists.txt
index 2384460..4e0ca2d 100644
--- a/active/app/src/CMakeLists.txt
+++ b/active/app/src/CMakeLists.txt
@@ -17,5 +17,5 @@ target_link_libraries(active-documentviewer
${ACTIVEAPP_LIBRARIES}
)
-install(TARGETS active-documentviewer ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS active-documentviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/active/components/CMakeLists.txt b/active/components/CMakeLists.txt
index 402f18d..5f75fc8 100644
--- a/active/components/CMakeLists.txt
+++ b/active/components/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(okularplugin
okularpart
)
-install(TARGETS okularplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/okular)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/okular)
+install(TARGETS okularplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/okular)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/okular)
#add_subdirectory(test)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index ce4e1e2..dd7cc3d 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
########### install files ###############
#
#
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR okular)
-kdoctools_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) \ No newline at end of file
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR okular)
+kdoctools_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) \ No newline at end of file
diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
index 6cfcd99..736a024 100644
--- a/generators/chm/CMakeLists.txt
+++ b/generators/chm/CMakeLists.txt
@@ -23,11 +23,11 @@ add_library(okularGenerator_chmlib MODULE ${okularGenerator_chmlib_SRCS})
target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} KF5::KHtml)
-install(TARGETS okularGenerator_chmlib DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_chmlib DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_chmlib.desktop okularChm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_chm.desktop active-documentviewer_chm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_chmlib.desktop okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_chm.desktop active-documentviewer_chm.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/chm/kio-msits/CMakeLists.txt b/generators/chm/kio-msits/CMakeLists.txt
index b23c452..746e819 100644
--- a/generators/chm/kio-msits/CMakeLists.txt
+++ b/generators/chm/kio-msits/CMakeLists.txt
@@ -14,10 +14,10 @@ add_library(kio_msits MODULE ${kio_msits_PART_SRCS})
target_link_libraries(kio_msits KF5::KIOCore ${CHM_LIBRARY} )
-install(TARGETS kio_msits DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kio_msits DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
-install( FILES msits.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES msits.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
index fc0320d..68ca1d2 100644
--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@@ -22,11 +22,11 @@ if (UNIX)
target_link_libraries(okularGenerator_comicbook KF5::Pty )
endif (UNIX)
-install(TARGETS okularGenerator_comicbook DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_comicbook DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_comicbook.desktop active-documentviewer_comicbook.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_comicbook.desktop okularComicbook.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_comicbook.desktop active-documentviewer_comicbook.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt
index d6cf843..8ac4b45 100644
--- a/generators/djvu/CMakeLists.txt
+++ b/generators/djvu/CMakeLists.txt
@@ -17,12 +17,12 @@ add_library(okularGenerator_djvu MODULE ${okularGenerator_djvu_SRCS})
target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF5::KDELibs4Support Qt5::Gui Qt5::PrintSupport)
-install(TARGETS okularGenerator_djvu DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_djvu DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_djvu.desktop okularDjvu.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_djvu.desktop active-documentviewer_djvu.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_djvu.desktop okularDjvu.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_djvu.desktop active-documentviewer_djvu.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt
index 1703565..30a9fb9 100644
--- a/generators/dvi/CMakeLists.txt
+++ b/generators/dvi/CMakeLists.txt
@@ -53,11 +53,11 @@ if (FREETYPE_FOUND)
target_link_libraries(okularGenerator_dvi ${FREETYPE_LIBRARIES})
endif (FREETYPE_FOUND)
-install(TARGETS okularGenerator_dvi DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_dvi DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_dvi.desktop okularDvi.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_dvi.desktop active-documentviewer_dvi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_dvi.desktop okularDvi.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_dvi.desktop active-documentviewer_dvi.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/epub/CMakeLists.txt b/generators/epub/CMakeLists.txt
index a7ef774..ee1b4f9 100644
--- a/generators/epub/CMakeLists.txt
+++ b/generators/epub/CMakeLists.txt
@@ -18,10 +18,10 @@ add_library(okularGenerator_epub MODULE ${okularGenerator_epub_PART_SRCS})
target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::KDELibs4Support Qt5::Widgets Qt5::Xml)
-install(TARGETS okularGenerator_epub DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_epub DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_epub.desktop okularEPub.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_epub.desktop active-documentviewer_epub.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_epub.desktop okularEPub.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_epub.desktop active-documentviewer_epub.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/epub/data/CMakeLists.txt b/generators/epub/data/CMakeLists.txt
index c6af209..b42c90a 100644
--- a/generators/epub/data/CMakeLists.txt
+++ b/generators/epub/data/CMakeLists.txt
@@ -2,4 +2,4 @@
install(FILES
okular-epub-sound-icon.png
okular-epub-movie.png
- DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
+ DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)
diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt
index fb82133..1799df8 100644
--- a/generators/fax/CMakeLists.txt
+++ b/generators/fax/CMakeLists.txt
@@ -11,10 +11,10 @@ add_library(okularGenerator_fax MODULE ${okularGenerator_fax_PART_SRCS})
target_link_libraries(okularGenerator_fax okularcore Qt5::Xml)
-install(TARGETS okularGenerator_fax DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_fax DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_fax.desktop okularFax.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_fax.desktop active-documentviewer_fax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_fax.desktop okularFax.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_fax.desktop active-documentviewer_fax.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/fictionbook/CMakeLists.txt b/generators/fictionbook/CMakeLists.txt
index 552d8fb..a5dca04 100644
--- a/generators/fictionbook/CMakeLists.txt
+++ b/generators/fictionbook/CMakeLists.txt
@@ -17,12 +17,12 @@ add_library(okularGenerator_fb MODULE ${okularGenerator_fb_PART_SRCS})
target_link_libraries(okularGenerator_fb okularcore KF5::KIOCore Qt5::Xml)
-install(TARGETS okularGenerator_fb DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_fb DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_fb.desktop active-documentviewer_fb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_fb.desktop active-documentviewer_fb.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-ecm_install_icons(ICONS hi16-apps-okular-fb2.png hi32-apps-okular-fb2.png hi48-apps-okular-fb2.png DESTINATION ${DATA_INSTALL_DIR}/okular/icons)
+ecm_install_icons(ICONS hi16-apps-okular-fb2.png hi32-apps-okular-fb2.png hi48-apps-okular-fb2.png DESTINATION ${KDE_INSTALL_DATADIR}/okular/icons)
diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
index f10d86f..58cfaf4 100644
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
set(okularGenerator_kimgio_PART_SRCS generator_kimgio.cpp )
add_library(okularGenerator_kimgio MODULE ${okularGenerator_kimgio_PART_SRCS})
target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2)
-install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_kimgio DESTINATION ${KDE_INSTALL_PLUGINDIR})
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp )
@@ -17,5 +17,5 @@ ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore
########### install files ###############
-install( FILES libokularGenerator_kimgio.desktop okularKimgio.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_kimgio.desktop active-documentviewer_kimgio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_kimgio.desktop okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_kimgio.desktop active-documentviewer_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/mobipocket/CMakeLists.txt b/generators/mobipocket/CMakeLists.txt
index abe9547..1adc63c 100644
--- a/generators/mobipocket/CMakeLists.txt
+++ b/generators/mobipocket/CMakeLists.txt
@@ -12,9 +12,9 @@ add_library(okularGenerator_mobi MODULE ${okularGenerator_mobi_PART_SRCS})
target_link_libraries(okularGenerator_mobi okularcore KF5::KDELibs4Support Qt5::Gui ${QMOBIPOCKET_LIBRARIES})
-install(TARGETS okularGenerator_mobi DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_mobi DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_mobi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_mobi.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/ooo/CMakeLists.txt b/generators/ooo/CMakeLists.txt
index a1eb1bc..3637607 100644
--- a/generators/ooo/CMakeLists.txt
+++ b/generators/ooo/CMakeLists.txt
@@ -32,11 +32,11 @@ if (Qca-qt5_FOUND)
target_link_libraries(okularGenerator_ooo okularcore qca-qt5)
endif ()
-install(TARGETS okularGenerator_ooo DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_ooo DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_ooo.desktop okularOoo.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_ooo.desktop active-documentviewer_ooo.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_ooo.desktop okularOoo.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_ooo.desktop active-documentviewer_ooo.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt
index 266a183..2d275dd 100644
--- a/generators/plucker/CMakeLists.txt
+++ b/generators/plucker/CMakeLists.txt
@@ -25,11 +25,11 @@ add_library(okularGenerator_plucker MODULE ${okularGenerator_plucker_SRCS} ${qun
target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore ${MATH_LIB} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
-install(TARGETS okularGenerator_plucker DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_plucker DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_plucker.desktop active-documentviewer_plucker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_plucker.desktop okularPlucker.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_plucker.desktop active-documentviewer_plucker.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index 33cbe48..aa7e467 100644
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@@ -37,11 +37,11 @@ add_library(okularGenerator_poppler MODULE ${okularGenerator_poppler_PART_SRCS})
target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore Qt5::Xml Qt5::Widgets Qt5::Gui )
-install(TARGETS okularGenerator_poppler DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_poppler DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_poppler.desktop okularPoppler.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_pdf.desktop active-documentviewer_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_poppler.desktop okularPoppler.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_pdf.desktop active-documentviewer_pdf.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/poppler/conf/CMakeLists.txt b/generators/poppler/conf/CMakeLists.txt
index 844e3fd..72bb84a 100644
--- a/generators/poppler/conf/CMakeLists.txt
+++ b/generators/poppler/conf/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES pdfsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES pdfsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt
index bdcd5b1..26cc79a 100644
--- a/generators/spectre/CMakeLists.txt
+++ b/generators/spectre/CMakeLists.txt
@@ -25,12 +25,12 @@ add_library(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS})
target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::KDELibs4Support Qt5::Xml Qt5::PrintSupport)
-install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_ghostview DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_ghostview.desktop active-documentviewer_ghostview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_ghostview.desktop active-documentviewer_ghostview.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-ecm_install_icons(ICONS hi16-apps-okular-gv.png hi32-app-okulars-gv.png DESTINATION ${DATA_INSTALL_DIR}/okular/icons)
+ecm_install_icons(ICONS hi16-apps-okular-gv.png hi32-app-okulars-gv.png DESTINATION ${KDE_INSTALL_DATADIR}/okular/icons)
diff --git a/generators/spectre/conf/CMakeLists.txt b/generators/spectre/conf/CMakeLists.txt
index 63364e7..b51035d 100644
--- a/generators/spectre/conf/CMakeLists.txt
+++ b/generators/spectre/conf/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES gssettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES gssettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
diff --git a/generators/tiff/CMakeLists.txt b/generators/tiff/CMakeLists.txt
index f7bcc3a..833d660 100644
--- a/generators/tiff/CMakeLists.txt
+++ b/generators/tiff/CMakeLists.txt
@@ -12,10 +12,10 @@ set(okularGenerator_tiff_SRCS
add_library(okularGenerator_tiff MODULE ${okularGenerator_tiff_SRCS})
target_link_libraries(okularGenerator_tiff okularcore ${TIFF_LIBRARIES})
-install(TARGETS okularGenerator_tiff DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_tiff DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_tiff.desktop okularTiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_tiff.desktop active-documentviewer_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_tiff.desktop okularTiff.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_tiff.desktop active-documentviewer_tiff.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/txt/CMakeLists.txt b/generators/txt/CMakeLists.txt
index 83fc5d2..e0f9801 100644
--- a/generators/txt/CMakeLists.txt
+++ b/generators/txt/CMakeLists.txt
@@ -15,10 +15,10 @@ set(okularGenerator_txt_SRCS
add_library(okularGenerator_txt MODULE ${okularGenerator_txt_SRCS})
target_link_libraries(okularGenerator_txt okularcore Qt5::Core)
-install(TARGETS okularGenerator_txt DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_txt DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_txt.desktop okularTxt.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_txt.desktop active-documentviewer_txt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_txt.desktop okularTxt.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_txt.desktop active-documentviewer_txt.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/generators/xps/CMakeLists.txt b/generators/xps/CMakeLists.txt
index fa9172e..41e973a 100644
--- a/generators/xps/CMakeLists.txt
+++ b/generators/xps/CMakeLists.txt
@@ -14,11 +14,11 @@ add_library(okularGenerator_xps MODULE ${okularGenerator_xps_SRCS})
target_link_libraries(okularGenerator_xps okularcore KF5::KIOCore Qt5::Xml)
-install(TARGETS okularGenerator_xps DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS okularGenerator_xps DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install( FILES libokularGenerator_xps.desktop okularXps.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_xps.desktop active-documentviewer_xps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES libokularGenerator_xps.desktop okularXps.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( PROGRAMS okularApplication_xps.desktop active-documentviewer_xps.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index ddbb9aa..0739cc9 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -34,10 +34,10 @@ if(KActivities_FOUND)
target_link_libraries(okular KF5::KActivities)
endif(KActivities_FOUND)
-install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS okular ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
# okular shell data files
-install( PROGRAMS org.kde.okular.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES shell.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/okular )
+install( PROGRAMS org.kde.okular.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES shell.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
diff --git a/ui/data/CMakeLists.txt b/ui/data/CMakeLists.txt
index 55b1ca4..dade573 100644
--- a/ui/data/CMakeLists.txt
+++ b/ui/data/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(icons)
# install annotator xml tools description
install(FILES
tools.xml
- DESTINATION ${DATA_INSTALL_DIR}/okular)
+ DESTINATION ${KDE_INSTALL_DATADIR}/okular)
# install annotation tool images
install(FILES
@@ -15,7 +15,7 @@ install(FILES
tool-note-okular-colorizable.png
tool-note-inline.png
tool-note-inline-okular-colorizable.png
- DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
+ DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)
# install annotation page images
install(FILES
checkmark.png
@@ -35,17 +35,17 @@ install(FILES
star.png
uparrow.png
upleftarrow.png
- DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
+ DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)
# install annotation stamps
install(FILES
stamps.svg
- DESTINATION ${DATA_INSTALL_DIR}/okular/pics)
+ DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)
# install misc images
# newstuff
if (FALSE)
install(FILES
okular.knsrc
- DESTINATION ${CONFIG_INSTALL_DIR})
+ DESTINATION ${KDE_INSTALL_CONFDIR})
endif (FALSE)
diff --git a/ui/data/icons/CMakeLists.txt b/ui/data/icons/CMakeLists.txt
index 630884f..1672cad 100644
--- a/ui/data/icons/CMakeLists.txt
+++ b/ui/data/icons/CMakeLists.txt
@@ -1 +1 @@
-ecm_install_icons( ICONS hi128-apps-okular.png hi16-apps-okular.png hi22-apps-okular.png hi32-apps-okular.png hi48-apps-okular.png hi64-apps-okular.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS hi128-apps-okular.png hi16-apps-okular.png hi22-apps-okular.png hi32-apps-okular.png hi48-apps-okular.png hi64-apps-okular.png DESTINATION ${KDE_INSTALL_ICONDIR} )