From b06c1ea5a471b2c9f68c0424d999a5385e77547a Mon Sep 17 00:00:00 2001
From: Vlad Zagorodniy <vladzzag@gmail.com>
Date: Tue, 5 Feb 2019 23:56:42 +0200
Subject: [PATCH] Move icons to data dir

Summary: We don't need them in the toplevel directory.

Test Plan: Compiles.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18771
---
 CMakeLists.txt                                    |  12 ------------
 data/CMakeLists.txt                               |   2 ++
 16-apps-kwin.png => data/icons/16-apps-kwin.png   | Bin
 32-apps-kwin.png => data/icons/32-apps-kwin.png   | Bin
 48-apps-kwin.png => data/icons/48-apps-kwin.png   | Bin
 data/icons/CMakeLists.txt                         |  11 +++++++++++
 sc-apps-kwin.svgz => data/icons/sc-apps-kwin.svgz | Bin
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename 16-apps-kwin.png => data/icons/16-apps-kwin.png (100%)
 rename 32-apps-kwin.png => data/icons/32-apps-kwin.png (100%)
 rename 48-apps-kwin.png => data/icons/48-apps-kwin.png (100%)
 create mode 100644 data/icons/CMakeLists.txt
 rename sc-apps-kwin.svgz => data/icons/sc-apps-kwin.svgz (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d94aba35f..6e43e79e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -694,18 +694,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${INCLUDE_I
 # Install the KWin/Script service type
 install( FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-ecm_install_icons(
-    ICONS
-        16-apps-kwin.png
-        32-apps-kwin.png
-        48-apps-kwin.png
-        sc-apps-kwin.svgz
-    DESTINATION
-        ${ICON_INSTALL_DIR}
-    THEME
-        hicolor
-)
-
 add_subdirectory(qml)
 add_subdirectory(packageplugins)
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 0fc2c674d..14cbc6660 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(icons)
+
 ########### next target ###############
 add_executable( kwin5_update_default_rules update_default_rules.cpp)
 
diff --git a/16-apps-kwin.png b/data/icons/16-apps-kwin.png
similarity index 100%
rename from 16-apps-kwin.png
rename to data/icons/16-apps-kwin.png
diff --git a/32-apps-kwin.png b/data/icons/32-apps-kwin.png
similarity index 100%
rename from 32-apps-kwin.png
rename to data/icons/32-apps-kwin.png
diff --git a/48-apps-kwin.png b/data/icons/48-apps-kwin.png
similarity index 100%
rename from 48-apps-kwin.png
rename to data/icons/48-apps-kwin.png
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
new file mode 100644
index 000000000..6a1b21d2c
--- /dev/null
+++ b/data/icons/CMakeLists.txt
@@ -0,0 +1,11 @@
+ecm_install_icons(
+    ICONS
+        16-apps-kwin.png
+        32-apps-kwin.png
+        48-apps-kwin.png
+        sc-apps-kwin.svgz
+    DESTINATION
+        ${ICON_INSTALL_DIR}
+    THEME
+        hicolor
+)
diff --git a/sc-apps-kwin.svgz b/data/icons/sc-apps-kwin.svgz
similarity index 100%
rename from sc-apps-kwin.svgz
rename to data/icons/sc-apps-kwin.svgz