summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2020-08-09 00:52:12 +0200
committerSlávek Banko <[email protected]>2020-08-09 00:52:12 +0200
commit303aa70c6187f9a41501784db213acd0cfb180d8 (patch)
treec8fc9001ef4f976f8ffc350b4b41e1ef43d2536f
parent18a5bfe2c8d01d28482d1af6de459fc9a8481c51 (diff)
downloadtde-systemsettings-303aa70c6187f9a41501784db213acd0cfb180d8.tar.gz
tde-systemsettings-303aa70c6187f9a41501784db213acd0cfb180d8.zip
Skip the installation of files that conflict with files
that are already contained in tdebase and tdeutils. Signed-off-by: Slávek Banko <[email protected]>
-rw-r--r--systemsettings/menu/CMakeLists.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/systemsettings/menu/CMakeLists.txt b/systemsettings/menu/CMakeLists.txt
index b67407e..2e70eb6 100644
--- a/systemsettings/menu/CMakeLists.txt
+++ b/systemsettings/menu/CMakeLists.txt
@@ -1,12 +1,19 @@
##### other data
+# intentionally omitted files that are already part of
+# ...tdebase
+# kcmfontinst.desktop
+# tde-settings-power.directory
+# tde-settings-system.directory
+# ...tdeutils
+# laptop.desktop
+
+
tde_create_translated_desktop(
SOURCE
audioencoding.desktop
defaultapplication.desktop
- kcmfontinst.desktop
kcm_knetworkconfmodule_ss.desktop
- laptop.desktop
medianotifications.desktop
)
@@ -28,11 +35,9 @@ tde_create_translated_desktop(
tde-settings-notifications.directory
tde-settings-panel.directory
tde-settings-personal.directory
- tde-settings-power.directory
tde-settings-regional.directory
tde-settings-sharing.directory
tde-settings-splashscreen.directory
- tde-settings-system.directory
tde-settings-useraccount.directory
tde-settings-windowbehavior.directory
tde-system-settings.directory