X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=icons%2FCMakeLists.txt;h=49066d3fcb8882ddd5e4b8277cc37a96b5b71c88;hp=480598eab82f73899f1014b5345fe19458d43e15;hb=f19fea582ace1d8f3dfe29c1096c48758079e56e;hpb=e41f08f5fe7b446c48aef48f04cb26b1a9ba0da2

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 480598ea..49066d3f 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -3,18 +3,47 @@
 # polluting the global namespace and to allow overriding
 
 if(WANT_MONO OR WANT_QTCLIENT)
+
+  # Figure out if we want to install KDE's icons
+  # Starting with KDE 4.3, they shouldn't be needed anymore
+  string(TOUPPER ${WITH_OXYGEN} OXY_UPPER)
+  if(NOT OXY_UPPER)
+    set(INSTALL_OXY false)
+  elseif(OXY_UPPER MATCHES "AUTO")
+    if(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
+      set(INSTALL_OXY false)
+    else(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
+      set(INSTALL_OXY true)
+    endif(HAVE_KDE AND KDE_VERSION VERSION_GREATER 4.2.99)
+  else(NOT OXY_UPPER)
+    set(INSTALL_OXY true)
+  endif(NOT OXY_UPPER)
+
+  if(INSTALL_OXY)
+    message(STATUS "Installing Oxygen icons")
+  else(INSTALL_OXY)
+    message(STATUS "Not installing Oxygen icons")
+  endif(INSTALL_OXY)
+
   if(EMBED_DATA)
-    set(CLIENT_RCS ${CLIENT_RCS} ../icons/hicolor.qrc ../icons/oxygen.qrc PARENT_SCOPE)
+    set(ICON_RCS ../icons/hicolor.qrc ../icons/oxygen.qrc)
+    if(INSTALL_OXY)
+      set(ICON_RCS ${ICON_RCS} ../icons/oxygen_kde.qrc)
+    endif(INSTALL_OXY)
+    set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE)
   else(EMBED_DATA)
     install(DIRECTORY hicolor DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
     install(DIRECTORY oxygen DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
+    if(INSTALL_OXY)
+      install(DIRECTORY oxygen_kde/ DESTINATION ${DATA_INSTALL_DIR}/quassel/icons/oxygen)
+    endif(INSTALL_OXY)
   endif(EMBED_DATA)
 endif(WANT_MONO OR WANT_QTCLIENT)
 
 # Application icon
 if(NOT APPLE AND NOT WIN32)
-  install(FILES oxygen/48x48/apps/quassel.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps)
+  install(FILES oxygen_kde/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)
+    install(FILES oxygen_kde/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
   endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
 endif(NOT APPLE AND NOT WIN32)