From 326d58a439d2183e45c348b340bc3fe1b5b2670e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 8 Feb 2021 07:05:59 +0100 Subject: [PATCH] GIT_SILENT: don't use deprecated cmake variable --- doc/CMakeLists.txt | 2 +- events/x11/CMakeLists.txt | 2 +- events/xdp/CMakeLists.txt | 2 +- framebuffers/pipewire/CMakeLists.txt | 2 +- framebuffers/qt/CMakeLists.txt | 2 +- framebuffers/xcb/CMakeLists.txt | 2 +- krfb/CMakeLists.txt | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3420b89..6693a2c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR krfb) diff --git a/events/x11/CMakeLists.txt b/events/x11/CMakeLists.txt index 2f21d35..c6ab0bc 100644 --- a/events/x11/CMakeLists.txt +++ b/events/x11/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries (krfb_events_x11 krfbprivate ) -install (TARGETS krfb_events_x11 DESTINATION ${PLUGIN_INSTALL_DIR}/krfb) +install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb) diff --git a/events/xdp/CMakeLists.txt b/events/xdp/CMakeLists.txt index 77d19b2..2383e19 100644 --- a/events/xdp/CMakeLists.txt +++ b/events/xdp/CMakeLists.txt @@ -23,5 +23,5 @@ target_link_libraries (krfb_events_xdp ) install (TARGETS krfb_events_xdp - DESTINATION ${PLUGIN_INSTALL_DIR}/krfb + DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb ) diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt index feeb6ca..cd7d9ce 100644 --- a/framebuffers/pipewire/CMakeLists.txt +++ b/framebuffers/pipewire/CMakeLists.txt @@ -49,5 +49,5 @@ target_link_libraries (krfb_framebuffer_pw ) install (TARGETS krfb_framebuffer_pw - DESTINATION ${PLUGIN_INSTALL_DIR}/krfb + DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb ) diff --git a/framebuffers/qt/CMakeLists.txt b/framebuffers/qt/CMakeLists.txt index 2752667..24776f2 100644 --- a/framebuffers/qt/CMakeLists.txt +++ b/framebuffers/qt/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries (krfb_framebuffer_qt ) install (TARGETS krfb_framebuffer_qt - DESTINATION ${PLUGIN_INSTALL_DIR}/krfb + DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb ) diff --git a/framebuffers/xcb/CMakeLists.txt b/framebuffers/xcb/CMakeLists.txt index 6991cca..65c956d 100644 --- a/framebuffers/xcb/CMakeLists.txt +++ b/framebuffers/xcb/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries (krfb_framebuffer_xcb ) install (TARGETS krfb_framebuffer_xcb - DESTINATION ${PLUGIN_INSTALL_DIR}/krfb + DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb ) diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt index 7f3246c..93bb029 100644 --- a/krfb/CMakeLists.txt +++ b/krfb/CMakeLists.txt @@ -36,14 +36,14 @@ set_target_properties (krfbprivate PROPERTIES ) install (TARGETS krfbprivate - ${INSTALL_TARGETS_DEFAULT_ARGS} + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP ) install (FILES krfb-framebuffer.desktop krfb-events.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} ) ##################################### @@ -120,13 +120,13 @@ if (X11_XTest_FOUND) endif (X11_XTest_FOUND) install (TARGETS krfb - ${INSTALL_TARGETS_DEFAULT_ARGS} + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### install (PROGRAMS org.kde.krfb.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_APPDIR} ) install(FILES org.kde.krfb.appdata.xml @@ -134,6 +134,6 @@ install(FILES org.kde.krfb.appdata.xml ) install (FILES krfb.notifyrc - DESTINATION ${DATA_INSTALL_DIR}/krfb + DESTINATION ${KDE_INSTALL_DATADIR}/krfb )