X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=icons%2FCMakeLists.txt;h=5824c6ef7bf1bd7cc1a538665fd483125bc8a880;hp=6393b1b8920a7e116dc1bb5b43f3fc0623658c8c;hb=e049ffc61b5e260a49d73102a74c3821af827e77;hpb=907e6c4c2f5e199600b54213f6964d2c50bdc700

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 6393b1b8..5824c6ef 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,13 +1,18 @@
-# Build and/or install icons according to global settings
+# Install icons
+# We put them in DATA_INSTALL_DIR rather than ICON_INSTALL_DIR, to avoid
+# polluting the global namespace and to allow overriding
 
-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(EMBED_DATA)
+  set(CLIENT_RCS ${CLIENT_RCS} ../icons/hicolor.qrc ../icons/oxygen.qrc PARENT_SCOPE)
+else(EMBED_DATA)
+  install(DIRECTORY hicolor DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
+  install(DIRECTORY oxygen DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
+endif(EMBED_DATA)
 
-if(OXYGEN_ICONS MATCHES "External")
-  install(DIRECTORY oxygen DESTINATION ${ICON_INSTALL_DIR})
-else(OXYGEN_ICONS MATCHES "External")
-  set(CLIENT_DEPS ${CLIENT_DEPS} oxygen.qrc)
-endif(OXYGEN_ICONS MATCHES "External")
+# Application icon
+if(NOT APPLE AND NOT WIN32)
+  install(FILES oxygen/48x48/apps/quassel.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps)
+  if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+    install(FILES oxygen/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
+  endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+endif(NOT APPLE AND NOT WIN32)