From 769504b020123d81c541c088a7b68e9c53e6d589 Mon Sep 17 00:00:00 2001
From: Oleg Shparber <trollixx@gmail.com>
Date: Sun, 15 Apr 2018 23:24:26 +0300
Subject: [PATCH] assets: Install app icons with ECMInstallIcons (fixes #922)
 (#926)

---
 assets/CMakeLists.txt                         |  18 +----------------
 .../128/zeal.png => 128-apps-zeal.png}        | Bin
 .../16/zeal.png => 16-apps-zeal.png}          | Bin
 .../24/zeal.png => 24-apps-zeal.png}          | Bin
 .../32/zeal.png => 32-apps-zeal.png}          | Bin
 .../64/zeal.png => 64-apps-zeal.png}          | Bin
 assets/freedesktop/CMakeLists.txt             |  19 ++++++++++++++++++
 7 files changed, 20 insertions(+), 17 deletions(-)
 rename assets/freedesktop/{appicons/128/zeal.png => 128-apps-zeal.png} (100%)
 rename assets/freedesktop/{appicons/16/zeal.png => 16-apps-zeal.png} (100%)
 rename assets/freedesktop/{appicons/24/zeal.png => 24-apps-zeal.png} (100%)
 rename assets/freedesktop/{appicons/32/zeal.png => 32-apps-zeal.png} (100%)
 rename assets/freedesktop/{appicons/64/zeal.png => 64-apps-zeal.png} (100%)
 create mode 100644 assets/freedesktop/CMakeLists.txt

diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 24790bbf..f90c5258 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -1,17 +1 @@
-if(UNIX AND NOT APPLE)
-    find_package(ECM REQUIRED NO_MODULE)
-    set(CMAKE_MODULE_PATH ${ECM_KDE_MODULE_DIR})
-    include(KDEInstallDirs)
-
-    foreach(_i 16 24 32 64 128)
-        install(FILES "freedesktop/appicons/${_i}/zeal.png"
-            DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/${_i}x${_i}/apps"
-            # TODO: Use `RENAME zeal.png` and get rid of subdirectories.
-        )
-    endforeach()
-
-    # TODO: Generate via zeal.desktop.in.
-    install(FILES "freedesktop/zeal.desktop"
-        DESTINATION ${KDE_INSTALL_APPDIR}
-    )
-endif()
+add_subdirectory(freedesktop)
diff --git a/assets/freedesktop/appicons/128/zeal.png b/assets/freedesktop/128-apps-zeal.png
similarity index 100%
rename from assets/freedesktop/appicons/128/zeal.png
rename to assets/freedesktop/128-apps-zeal.png
diff --git a/assets/freedesktop/appicons/16/zeal.png b/assets/freedesktop/16-apps-zeal.png
similarity index 100%
rename from assets/freedesktop/appicons/16/zeal.png
rename to assets/freedesktop/16-apps-zeal.png
diff --git a/assets/freedesktop/appicons/24/zeal.png b/assets/freedesktop/24-apps-zeal.png
similarity index 100%
rename from assets/freedesktop/appicons/24/zeal.png
rename to assets/freedesktop/24-apps-zeal.png
diff --git a/assets/freedesktop/appicons/32/zeal.png b/assets/freedesktop/32-apps-zeal.png
similarity index 100%
rename from assets/freedesktop/appicons/32/zeal.png
rename to assets/freedesktop/32-apps-zeal.png
diff --git a/assets/freedesktop/appicons/64/zeal.png b/assets/freedesktop/64-apps-zeal.png
similarity index 100%
rename from assets/freedesktop/appicons/64/zeal.png
rename to assets/freedesktop/64-apps-zeal.png
diff --git a/assets/freedesktop/CMakeLists.txt b/assets/freedesktop/CMakeLists.txt
new file mode 100644
index 00000000..0e566ef4
--- /dev/null
+++ b/assets/freedesktop/CMakeLists.txt
@@ -0,0 +1,19 @@
+if(UNIX AND NOT APPLE)
+    find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+    include(ECMInstallIcons)
+    include(KDEInstallDirs)
+
+    ecm_install_icons(ICONS "16-apps-zeal.png"
+                            "24-apps-zeal.png"
+                            "32-apps-zeal.png"
+                            "64-apps-zeal.png"
+                            "128-apps-zeal.png"
+                      DESTINATION ${KDE_INSTALL_ICONDIR}
+    )
+
+    # TODO: Generate via zeal.desktop.in.
+    install(FILES "zeal.desktop"
+            DESTINATION ${KDE_INSTALL_APPDIR}
+    )
+endif()