From 23e197789faad810c6c1f9c26f5e44a2c6d062b5 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Sat, 23 Mar 2024 13:57:28 +0200 Subject: [PATCH] make it build together --- sources/awesomewidgets/CMakeLists.txt | 20 +- .../awesomewidgets-extweather-ids.json | 208 +++++++++--------- sources/desktop-panel/CMakeLists.txt | 2 +- sources/desktop-panel/metadata.desktop | 26 --- sources/desktop-panel/metadata.json | 7 +- .../package/contents/config/config.qml | 2 +- .../package/contents/config/main.xml | 50 ++--- .../package/contents/ui/about.qml | 2 +- .../package/contents/ui/activeapp.qml | 2 +- .../package/contents/ui/advanced.qml | 6 +- .../package/contents/ui/inactiveapp.qml | 2 +- .../package/contents/ui/main.qml | 14 +- .../package/contents/ui/widget.qml | 2 +- .../desktop-panel/package/metadata.desktop | 26 --- sources/desktop-panel/package/metadata.json | 26 +++ sources/desktop-panel/plugin/CMakeLists.txt | 4 +- sources/desktop-panel/plugin/dpadds.cpp | 2 +- sources/extsysmon/CMakeLists.txt | 2 +- sources/libraries.cmake | 6 +- sources/translations/CMakeLists.txt | 4 +- 20 files changed, 191 insertions(+), 222 deletions(-) delete mode 100644 sources/desktop-panel/metadata.desktop delete mode 100644 sources/desktop-panel/package/metadata.desktop create mode 100644 sources/desktop-panel/package/metadata.json diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt index 881ec58..c49d13a 100644 --- a/sources/awesomewidgets/CMakeLists.txt +++ b/sources/awesomewidgets/CMakeLists.txt @@ -33,13 +33,13 @@ add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUB target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) # install -install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(FILES ${SUBPROJECT_INI} DESTINATION ${KDE_INSTALL_CONFDIR}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather) +install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}) +install(FILES ${SUBPROJECT_INI} DESTINATION /${KDE_INSTALL_CONFDIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}/weather) diff --git a/sources/awesomewidgets/awesomewidgets-extweather-ids.json b/sources/awesomewidgets/awesomewidgets-extweather-ids.json index e8ec649..0c47dec 100644 --- a/sources/awesomewidgets/awesomewidgets-extweather-ids.json +++ b/sources/awesomewidgets/awesomewidgets-extweather-ids.json @@ -5,120 +5,120 @@ "image": { "__comment": "should be described as html image with full path inside", - "default": "", + "default": "", - "800": "", + "800": "", - "801": "", + "801": "", - "802": "", - "803": "", + "802": "", + "803": "", - "804": "", + "804": "", - "300": "", - "301": "", - "302": "", - "310": "", - "311": "", - "312": "", - "313": "", - "314": "", - "321": "", - "520": "", - "521": "", - "522": "", - "531": "", + "300": "", + "301": "", + "302": "", + "310": "", + "311": "", + "312": "", + "313": "", + "314": "", + "321": "", + "520": "", + "521": "", + "522": "", + "531": "", - "500": "", - "501": "", - "502": "", - "503": "", - "504": "", + "500": "", + "501": "", + "502": "", + "503": "", + "504": "", - "200": "", - "201": "", - "202": "", - "210": "", - "211": "", - "212": "", - "221": "", - "230": "", - "231": "", - "232": "", + "200": "", + "201": "", + "202": "", + "210": "", + "211": "", + "212": "", + "221": "", + "230": "", + "231": "", + "232": "", - "511": "", - "600": "", - "601": "", - "602": "", - "611": "", - "612": "", - "615": "", - "616": "", - "620": "", - "621": "", - "622": "", + "511": "", + "600": "", + "601": "", + "602": "", + "611": "", + "612": "", + "615": "", + "616": "", + "620": "", + "621": "", + "622": "", - "701": "", - "711": "", - "721": "", - "731": "", - "741": "", - "751": "", - "761": "", - "762": "", - "771": "", - "781": "", + "701": "", + "711": "", + "721": "", + "731": "", + "741": "", + "751": "", + "761": "", + "762": "", + "771": "", + "781": "", - "0": "", - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "6": "", - "7": "", - "8": "", - "9": "", - "10": "", - "11": "", - "12": "", - "13": "", - "14": "", - "15": "", - "16": "", - "17": "", - "18": "", - "19": "", - "20": "", - "21": "", - "22": "", - "23": "", - "24": "", - "25": "", - "26": "", - "27": "", - "28": "", - "29": "", - "30": "", - "31": "", - "32": "", - "33": "", - "34": "", - "35": "", - "36": "", - "37": "", - "38": "", - "39": "", - "40": "", - "41": "", - "42": "", - "43": "", - "44": "", - "45": "", - "46": "", - "47": "", - "3200": "" + "0": "", + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", + "7": "", + "8": "", + "9": "", + "10": "", + "11": "", + "12": "", + "13": "", + "14": "", + "15": "", + "16": "", + "17": "", + "18": "", + "19": "", + "20": "", + "21": "", + "22": "", + "23": "", + "24": "", + "25": "", + "26": "", + "27": "", + "28": "", + "29": "", + "30": "", + "31": "", + "32": "", + "33": "", + "34": "", + "35": "", + "36": "", + "37": "", + "38": "", + "39": "", + "40": "", + "41": "", + "42": "", + "43": "", + "44": "", + "45": "", + "46": "", + "47": "", + "3200": "" }, "text": { diff --git a/sources/desktop-panel/CMakeLists.txt b/sources/desktop-panel/CMakeLists.txt index 6d7ea73..0bb8bcd 100644 --- a/sources/desktop-panel/CMakeLists.txt +++ b/sources/desktop-panel/CMakeLists.txt @@ -1,7 +1,7 @@ set(SUBPROJECT plasma_applet_desktop-panel) message(STATUS "Subproject ${SUBPROJECT}") -configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop) +configure_file(metadata.json ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.json) add_subdirectory(plugin) plasma_install_package(package org.kde.plasma.desktoppanel) diff --git a/sources/desktop-panel/metadata.desktop b/sources/desktop-panel/metadata.desktop deleted file mode 100644 index a0950d9..0000000 --- a/sources/desktop-panel/metadata.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Desktop Panel -Comment=A minimalistic Plasmoid -Comment[en]=A minimalistic Plasmoid -Comment[es]=Un plasmoide minimalista -Comment[es]=Un script Plasmoïde minimaliste -Comment[pt_BR]=Um script Plasmoid -Comment[ru]=Минималистичный плазмоид -Comment[uk]=Мінімалістичний плазмоїд -X-KDE-ServiceTypes=Plasma/Applet -Type=Service -Icon=utilities-system-monitor - -X-KDE-ServiceTypes=Plasma/Applet -X-Plasma-API=declarativeappletscript -X-Plasma-MainScript=ui/main.qml - -X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis -X-KDE-PluginInfo-Email=esalexeev@gmail.com -X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel -X-KDE-PluginInfo-Version=@PROJECT_VERSION@ -X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ -X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-License=GPLv3 -X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/desktop-panel/metadata.json b/sources/desktop-panel/metadata.json index efd12be..88ff508 100644 --- a/sources/desktop-panel/metadata.json +++ b/sources/desktop-panel/metadata.json @@ -1,4 +1,5 @@ { + "KPackageStructure": "Plasma/Applet", "KPlugin": { "Authors": [ { @@ -18,12 +19,8 @@ "Id": "org.kde.plasma.desktoppanel", "License": "GPLv3", "Name": "Desktop Panel", - "ServiceTypes": [ - "Plasma/Applet" - ], "Version": "@PROJECT_VERSION@", "Website": "https://arcanis.me/projects/awesome-widgets/" }, - "X-Plasma-API": "declarativeappletscript", - "X-Plasma-MainScript": "ui/main.qml" + "X-Plasma-API-Minimum-Version": "6.0" } diff --git a/sources/desktop-panel/package/contents/config/config.qml b/sources/desktop-panel/package/contents/config/config.qml index 9f6f6c3..a9ad5da 100644 --- a/sources/desktop-panel/package/contents/config/config.qml +++ b/sources/desktop-panel/package/contents/config/config.qml @@ -15,7 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import org.kde.plasma.configuration 2.0 diff --git a/sources/desktop-panel/package/contents/config/main.xml b/sources/desktop-panel/package/contents/config/main.xml index 7c147f6..83c4b65 100644 --- a/sources/desktop-panel/package/contents/config/main.xml +++ b/sources/desktop-panel/package/contents/config/main.xml @@ -7,88 +7,88 @@ - + [$mark$number/$total: $name] - + true - + false - + 0 - + 0 - + ¤ - + contours - + 200 - + #ffffff - + center - + Terminus - + 12 - + #000000 - + normal - + normal - + normal - + #000000 - + center - + Terminus - + 12 - + #ff0000 - + normal - + normal - + normal - + #000000 diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index fd6361a..1df9fd2 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -15,7 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import org.kde.plasma.private.desktoppanel 1.0 diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml index 0c51790..4013442 100644 --- a/sources/desktop-panel/package/contents/ui/activeapp.qml +++ b/sources/desktop-panel/package/contents/ui/activeapp.qml @@ -15,7 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import org.kde.plasma.private.desktoppanel 1.0 import "." diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml index 38ac1c8..a3d0a52 100644 --- a/sources/desktop-panel/package/contents/ui/advanced.qml +++ b/sources/desktop-panel/package/contents/ui/advanced.qml @@ -15,8 +15,8 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 1.3 as QtControls +import QtQuick 2.15 +import QtQuick.Controls import org.kde.plasma.private.desktoppanel 1.0 @@ -131,7 +131,7 @@ Item { onValueEdited: cfg_mark = newValue } - QtControls.GroupBox { + GroupBox { height: implicitHeight width: parent.width title: i18n("Tooltip") diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml index 6e04fed..e650dab 100644 --- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml +++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml @@ -15,7 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import org.kde.plasma.private.desktoppanel 1.0 import "." diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index e8382ad..4301fbb 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -15,18 +15,17 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.4 -import QtQuick.Controls 1.3 as QtControls -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls +import QtQuick.Layouts +import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.private.desktoppanel 1.0 import "." -Item { +PlasmoidItem { id: main // backend DPAdds { @@ -46,9 +45,6 @@ Item { // init - Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation - Plasmoid.compactRepresentation: Plasmoid.fullRepresentation - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Plasmoid.icon: "utilities-system-monitor" diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml index 683419e..1c47788 100644 --- a/sources/desktop-panel/package/contents/ui/widget.qml +++ b/sources/desktop-panel/package/contents/ui/widget.qml @@ -15,7 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import org.kde.plasma.private.desktoppanel 1.0 import "." diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop deleted file mode 100644 index 8220a91..0000000 --- a/sources/desktop-panel/package/metadata.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Desktop Panel -Comment=A minimalistic Plasmoid -Comment[en]=A minimalistic Plasmoid -Comment[es]=Un plasmoide minimalista -Comment[es]=Un script Plasmoïde minimaliste -Comment[pt_BR]=Um script Plasmoid -Comment[ru]=Минималистичный плазмоид -Comment[uk]=Мінімалістичний плазмоїд -X-KDE-ServiceTypes=Plasma/Applet -Type=Service -Icon=utilities-system-monitor - -X-KDE-ServiceTypes=Plasma/Applet -X-Plasma-API=declarativeappletscript -X-Plasma-MainScript=ui/main.qml - -X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis -X-KDE-PluginInfo-Email=esalexeev@gmail.com -X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel -X-KDE-PluginInfo-Version=3.5.1 -X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ -X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-License=GPLv3 -X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/desktop-panel/package/metadata.json b/sources/desktop-panel/package/metadata.json new file mode 100644 index 0000000..5ceb3d0 --- /dev/null +++ b/sources/desktop-panel/package/metadata.json @@ -0,0 +1,26 @@ +{ + "KPackageStructure": "Plasma/Applet", + "KPlugin": { + "Authors": [ + { + "Email": "esalexeev@gmail.com", + "Name": "Evgeniy Alekseev aka arcanis" + } + ], + "Category": "System Information", + "Description": "A minimalistic Plasmoid", + "Description[en]": "A minimalistic Plasmoid", + "Description[es]": "Un script Plasmoïde minimaliste", + "Description[pt_BR]": "Um script Plasmoid", + "Description[ru]": "Минималистичный плазмоид", + "Description[uk]": "Мінімалістичний плазмоїд", + "EnabledByDefault": true, + "Icon": "utilities-system-monitor", + "Id": "org.kde.plasma.desktoppanel", + "License": "GPLv3", + "Name": "Desktop Panel", + "Version": "3.5.1", + "Website": "https://arcanis.me/projects/awesome-widgets/" + }, + "X-Plasma-API-Minimum-Version": "6.0" +} diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt index 25cf51f..21d3c0f 100644 --- a/sources/desktop-panel/plugin/CMakeLists.txt +++ b/sources/desktop-panel/plugin/CMakeLists.txt @@ -15,6 +15,6 @@ file(GLOB SUBPROJECT_NOTIFY *.notifyrc) add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE}) target_link_libraries(${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) -install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/desktoppanel) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/desktoppanel) install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}) diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index e3632ef..0782664 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -223,7 +223,7 @@ QString DPAdds::valueByKey(const QString &_key, int _desktop) const QString currentMark = currentDesktop() == _desktop ? m_mark : ""; if (_key == "mark") - return QString("%1").arg(currentMark, m_mark.count(), QLatin1Char(' ')).replace(" ", " "); + return QString("%1").arg(currentMark, m_mark.size(), QLatin1Char(' ')).replace(" ", " "); else if (_key == "name") { auto name = m_vdi->desktopNames().at(_desktop); return name.replace(" ", " "); diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt index 07b1ba4..6d5fa27 100644 --- a/sources/extsysmon/CMakeLists.txt +++ b/sources/extsysmon/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(${SUBPROJECT} # install install(TARGETS ${SUBPROJECT} DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksystemstats) -install(FILES ${SUBPROJECT_CONF} DESTINATION ${KDE_INSTALL_CONFDIR}) +install(FILES ${SUBPROJECT_CONF} DESTINATION /${KDE_INSTALL_CONFDIR}) diff --git a/sources/libraries.cmake b/sources/libraries.cmake index c8b9695..2d9aaa9 100644 --- a/sources/libraries.cmake +++ b/sources/libraries.cmake @@ -18,13 +18,15 @@ set(Qt_LIBRARIES # kf6 libraries find_package(ECM 0.0.11 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) find_package(KF6 REQUIRED COMPONENTS I18n Notifications Service WindowSystem) +find_package(KSysGuard REQUIRED) find_package(LibTaskManager REQUIRED) find_package(Plasma REQUIRED) -find_package(KSysGuard REQUIRED) + include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) + set(Kf6_INCLUDE ${KDE_INSTALL_FULL_INCLUDEDIR_KF}) set(Kf6_LIBRARIES KF6::CoreAddons KF6::I18n KF6::Notifications KF6::WindowSystem KSysGuard::Sensors KSysGuard::SensorFaces KSysGuard::SystemStats PW::LibTaskManager) diff --git a/sources/translations/CMakeLists.txt b/sources/translations/CMakeLists.txt index 9b375e5..47c37ea 100644 --- a/sources/translations/CMakeLists.txt +++ b/sources/translations/CMakeLists.txt @@ -16,12 +16,12 @@ foreach (_current_PO_FILE ${_po_files}) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo - DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/ + DESTINATION ${KDE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES/ RENAME ${MO_NAME} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo - DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/ + DESTINATION ${KDE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES/ RENAME ${SND_MO_NAME} ) list(APPEND _gmoFiles ${_gmoFile})