first version of richtext support for input widget - needs a lot of refactoring

[quassel.git] / icons / CMakeLists.txt

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 49066d3..0fda03e 100644 (file)
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -6,17 +6,16 @@ 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
+  set(INSTALL_OXY true)
   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)
+    if(HAVE_KDE)
+      if(KDE_VERSION VERSION_GREATER 4.2.99)
+        set(INSTALL_OXY false)
+      endif(KDE_VERSION VERSION_GREATER 4.2.99)
+    endif(HAVE_KDE)
   endif(NOT OXY_UPPER)
 
   if(INSTALL_OXY)
@@ -32,7 +31,7 @@ if(WANT_MONO OR WANT_QTCLIENT)
     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 hicolor DESTINATION ${ICON_INSTALL_DIR})
     install(DIRECTORY oxygen DESTINATION ${DATA_INSTALL_DIR}/quassel/icons)
     if(INSTALL_OXY)
       install(DIRECTORY oxygen_kde/ DESTINATION ${DATA_INSTALL_DIR}/quassel/icons/oxygen)