From afaac2d1b0a7b2c8327e6f0d5aaa6af779ce847d Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Mon, 17 Apr 2023 19:37:04 +0200 Subject: [PATCH] Use undeprecated ECM install variable --- KDEConnectMacros.cmake | 2 +- plasmoid/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/KDEConnectMacros.cmake b/KDEConnectMacros.cmake index b4fdddd6a..8b1cc09b6 100644 --- a/KDEConnectMacros.cmake +++ b/KDEConnectMacros.cmake @@ -5,6 +5,6 @@ function(kdeconnect_add_plugin) kcoreaddons_add_plugin(${ARGN} INSTALL_NAMESPACE kdeconnect) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}_config.qml") - install(FILES "${ARGV0}_config.qml" DESTINATION ${DATA_INSTALL_DIR}/kdeconnect) + install(FILES "${ARGV0}_config.qml" DESTINATION ${KDE_INSTALL_DATADIR}/kdeconnect) endif() endfunction() diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt index 0afd2b39c..e197aa766 100644 --- a/plasmoid/CMakeLists.txt +++ b/plasmoid/CMakeLists.txt @@ -1,5 +1,7 @@ kpackage_install_package(package org.kde.kdeconnect plasmoids plasma NO_DEPRECATED_WARNING) +if("${QT_MAJOR_VERSION}" STREQUAL 5) install(FILES package/metadata.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} RENAME plasma-kdeconnect.desktop) +endif()