segregate icons into different folders

CMakeLists.txt

@@ -105,7 +105,7 @@ add_subdirectory(plugins)
 add_subdirectory(interfaces)
 
 if (NOT SAILFISHOS)
-    add_subdirectory(icon)
+    add_subdirectory(icons)
     add_subdirectory(data)
     add_subdirectory(cli)
     add_subdirectory(declarativeplugin)

icon/CMakeLists.txt

-
-set(APP_ICONS
-    sc-apps-kdeconnect.svg
-    sc-apps-kdeconnectindicator.svg
-)
-
-list(APPEND APP_ICONS sc-apps-kdeconnectindicatordark.svg)
-
-if(APPLE)
-    # Craft adds share/icons into blacklist, which will not be copied into the bundle
-    # As a workaround, on macOS, set ICON_INSTALL_DIR to another path
-    set(ICON_INSTALL_DIR share/kdeconnect-icons)
-endif()
-
-ecm_install_icons(
-ICONS
-    ${APP_ICONS}
-DESTINATION
-    ${ICON_INSTALL_DIR}
-)
-
-ecm_install_icons(
-ICONS
-    16-status-laptopconnected.svg
-    16-status-laptopdisconnected.svg
-    16-status-laptoptrusted.svg
-    16-status-smartphoneconnected.svg
-    16-status-smartphonedisconnected.svg
-    16-status-smartphonetrusted.svg
-    16-status-tabletconnected.svg
-    16-status-tabletdisconnected.svg
-    16-status-tablettrusted.svg
-    16-status-tvconnected.svg
-    16-status-tvdisconnected.svg
-    16-status-tvtrusted.svg
-    22-status-laptopconnected.svg
-    22-status-laptopdisconnected.svg
-    22-status-laptoptrusted.svg
-    22-status-smartphoneconnected.svg
-    22-status-smartphonedisconnected.svg
-    22-status-smartphonetrusted.svg
-    22-status-tabletconnected.svg
-    22-status-tabletdisconnected.svg
-    22-status-tablettrusted.svg
-    22-status-tvconnected.svg
-    22-status-tvdisconnected.svg
-    22-status-tvtrusted.svg
-    32-status-laptopconnected.svg
-    32-status-laptopdisconnected.svg
-    32-status-laptoptrusted.svg
-    32-status-smartphoneconnected.svg
-    32-status-smartphonedisconnected.svg
-    32-status-smartphonetrusted.svg
-    32-status-tabletconnected.svg
-    32-status-tabletdisconnected.svg
-    32-status-tablettrusted.svg
-    32-status-tvconnected.svg
-    32-status-tvdisconnected.svg
-    32-status-tvtrusted.svg
-DESTINATION
-    ${ICON_INSTALL_DIR}
-)
-

icons/CMakeLists.txt

+
+set(APP_ICONS
+    ${CMAKE_CURRENT_SOURCE_DIR}/app/sc-apps-kdeconnect.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/app/sc-apps-kdeconnectindicator.svg)
+
+list(APPEND APP_ICONS
+    ${CMAKE_CURRENT_SOURCE_DIR}/app/sc-apps-kdeconnectindicatordark.svg)
+
+if(APPLE)
+    # Craft adds share/icons into blacklist, which will not be copied into the bundle
+    # As a workaround, on macOS, set ICON_INSTALL_DIR to another path
+    set(ICON_INSTALL_DIR share/kdeconnect-icons)
+endif()
+
+ecm_install_icons(ICONS ${APP_ICONS} DESTINATION ${ICON_INSTALL_DIR})
+
+ecm_install_icons(ICONS
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-laptopconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-laptopdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-laptoptrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-smartphoneconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-smartphonedisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-smartphonetrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tabletconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tabletdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tablettrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tvconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tvdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-tvtrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-laptopconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-laptopdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-laptoptrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-smartphoneconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-smartphonedisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-smartphonetrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tabletconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tabletdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tablettrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tvconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tvdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/22-status-tvtrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-laptopconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-laptopdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-laptoptrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-smartphoneconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-smartphonedisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-smartphonetrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tabletconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tabletdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tablettrusted.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvdisconnected.svg
+    ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvtrusted.svg
+    DESTINATION ${ICON_INSTALL_DIR})