X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=icons%2FCMakeLists.txt;h=1a25353736f8585c3fea984e0a17156713981a33;hp=129bc8848997dc1e4e2576bbe183965bb43237b1;hb=5dbf544a08ef96a933d61ffa3b7bc711ebdab244;hpb=e8e1f038e6bf4a7bc938e316774374d3116ff39a

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 129bc884..1a253537 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,11 +1,42 @@
-# Build and/or install icons according to global settings
+# Install icons
+#
+# We put the bundled oxygen icon theme in DATADIR rather than ICONDIR,
+# in order to avoid conflicts. As we add this directory to XDG_DATA_DIRS at runtime,
+# the bundled theme will be found by Qt only if there is no oxygen theme installed
+# in system directories.
+#
+# The hicolor folder contains icons vital for the Quassel UI (such as in the channel and nick
+# lists). It is installed into the system icon directory (in order to allow overriding) and
+# additionally always embedded as a fallback resource.
 
-if(QUASSEL_ICONS MATCHES "External")
-  install(DIRECTORY hicolor DESTINATION ${ICON_INSTALL_DIR})
-else(QUASSEL_ICONS MATCHES "External")
-#  set(CLIENT_DEPS ${CLIENT_DEPS} hicolor.qrc)
-endif(QUASSEL_ICONS MATCHES "External")
+if (WANT_MONO OR WANT_QTCLIENT)
+    set(ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/hicolor.qrc) # always embed those
 
-if(OXYGEN_ICONS MATCHES "Builtin")
-#  set(CLIENT_DEPS ${CLIENT_DEPS} oxygen.qrc)
-endif(OXYGEN_ICONS MATCHES "Builtin")
+    if (EMBED_DATA)
+        if (WITH_OXYGEN)
+            message(STATUS "Embedding bundled Oxygen icons")
+            set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/oxygen.qrc)
+        endif()
+    else()
+        install(DIRECTORY hicolor DESTINATION ${CMAKE_INSTALL_ICONDIR})
+        if (WITH_OXYGEN)
+            message(STATUS "Installing bundled Oxygen icons")
+            install(DIRECTORY oxygen DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons)
+        endif()
+    endif()
+
+    if (NOT WITH_OXYGEN)
+        message(STATUS "Not installing bundled Oxygen icons")
+    endif()
+
+    set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE)
+endif()
+
+# Application icon
+
+if (HAVE_KDE OR (UNIX AND NOT APPLE))
+    install(FILES hicolor/48x48/apps/quassel.png DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor/48x48/apps)
+    if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+        install(FILES hicolor/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
+    endif()
+endif()