From 6099bf491f682d0ac061d42a4423870014178676 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 21 Apr 2022 00:42:11 +0200 Subject: [PATCH] Use undeprecated install dirs Using kde-dev-scripts/kf5/cmakelists_install_vars.pl --- CMakeLists.txt | 2 +- bin/CMakeLists.txt | 2 +- components/mmplugin/CMakeLists.txt | 4 ++-- containments/panel/CMakeLists.txt | 2 +- quicksettings/flashlight/CMakeLists.txt | 4 ++-- quicksettings/nightcolor/CMakeLists.txt | 4 ++-- quicksettings/powermenu/CMakeLists.txt | 4 ++-- quicksettings/screenrotation/CMakeLists.txt | 4 ++-- quicksettings/screenshot/CMakeLists.txt | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b3083bf..012a2a9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ include(CheckIncludeFiles) plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel) plasma_install_package(shell org.kde.plasma.phoneshell shells) -install(FILES plasma_phone_components.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) +install(FILES plasma_phone_components.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) add_subdirectory(bin) add_subdirectory(containments) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 75b38ab3..2aa7cbea 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later configure_file(kwinwrapper.in ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper) -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper DESTINATION ${BIN_INSTALL_DIR}) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper DESTINATION ${KDE_INSTALL_BINDIR}) configure_file(plasma-mobile.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-mobile.desktop) install(FILES diff --git a/components/mmplugin/CMakeLists.txt b/components/mmplugin/CMakeLists.txt index 53d2cc7b..b90b8c47 100644 --- a/components/mmplugin/CMakeLists.txt +++ b/components/mmplugin/CMakeLists.txt @@ -16,5 +16,5 @@ target_link_libraries(ppc-mmqmlplugin set_property(TARGET ppc-mmqmlplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/mm) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/mm) -install(TARGETS ppc-mmqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mm) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/mm) +install(TARGETS ppc-mmqmlplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/mm) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/mm) diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt index d68488e2..9c353c79 100644 --- a/containments/panel/CMakeLists.txt +++ b/containments/panel/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(plasma_applet_phonepanel ) install(TARGETS plasma_applet_phonepanel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets) -#install(FILES plasma-phonepanel-default.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +#install(FILES plasma-phonepanel-default.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) plasma_install_package(package org.kde.phone.panel) diff --git a/quicksettings/flashlight/CMakeLists.txt b/quicksettings/flashlight/CMakeLists.txt index aa19a02d..3666e670 100644 --- a/quicksettings/flashlight/CMakeLists.txt +++ b/quicksettings/flashlight/CMakeLists.txt @@ -29,8 +29,8 @@ target_link_libraries(flashlightplugin set_property(TARGET flashlightplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/flashlight) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/flashlight) -install(TARGETS flashlightplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/flashlight) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/flashlight) +install(TARGETS flashlightplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/flashlight) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/flashlight) plasma_install_package(package org.kde.plasma.quicksetting.flashlight quicksettings) diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt index c2947d16..9243a83d 100644 --- a/quicksettings/nightcolor/CMakeLists.txt +++ b/quicksettings/nightcolor/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(nightcolorplugin set_property(TARGET nightcolorplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/nightcolor) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/nightcolor) -install(TARGETS nightcolorplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/nightcolor) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/nightcolor) +install(TARGETS nightcolorplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/nightcolor) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/nightcolor) plasma_install_package(package org.kde.plasma.quicksetting.nightcolor quicksettings) diff --git a/quicksettings/powermenu/CMakeLists.txt b/quicksettings/powermenu/CMakeLists.txt index fed5385e..4a061cb0 100644 --- a/quicksettings/powermenu/CMakeLists.txt +++ b/quicksettings/powermenu/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries(powermenuplugin set_property(TARGET powermenuplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/powermenu) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/powermenu) -install(TARGETS powermenuplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/powermenu) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/powermenu) +install(TARGETS powermenuplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/powermenu) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/powermenu) plasma_install_package(package org.kde.plasma.quicksetting.powermenu quicksettings) diff --git a/quicksettings/screenrotation/CMakeLists.txt b/quicksettings/screenrotation/CMakeLists.txt index bf6e2190..39d39a55 100644 --- a/quicksettings/screenrotation/CMakeLists.txt +++ b/quicksettings/screenrotation/CMakeLists.txt @@ -31,8 +31,8 @@ target_link_libraries(screenrotationplugin set_property(TARGET screenrotationplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenrotation) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenrotation) -install(TARGETS screenrotationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenrotation) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenrotation) +install(TARGETS screenrotationplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/screenrotation) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/screenrotation) plasma_install_package(package org.kde.plasma.quicksetting.screenrotation quicksettings) diff --git a/quicksettings/screenshot/CMakeLists.txt b/quicksettings/screenshot/CMakeLists.txt index a0c536d3..927f966b 100644 --- a/quicksettings/screenshot/CMakeLists.txt +++ b/quicksettings/screenshot/CMakeLists.txt @@ -31,8 +31,8 @@ target_link_libraries(screenshotplugin set_property(TARGET screenshotplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenshot) file(COPY qmldir DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenshot) -install(TARGETS screenshotplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenshot) -install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/quicksetting/screenshot) +install(TARGETS screenshotplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/screenshot) +install(FILES qmldir ${qml_SRC} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/quicksetting/screenshot) plasma_install_package(package org.kde.plasma.quicksetting.screenshot quicksettings)