X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=icons%2FCMakeLists.txt;h=3eaea88a01ff101285a68609a4794734bf2be225;hp=085ca92cd35b61b67b57ded83633712282b8e4d2;hb=22d79ae4d680a3532b64c91440c02b53c81fdf36;hpb=8802aa034ebb6cee594fe37042a3f3265dcc6726

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 085ca92c..3eaea88a 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -40,9 +40,17 @@ if(WANT_MONO OR WANT_QTCLIENT)
 endif(WANT_MONO OR WANT_QTCLIENT)
 
 # Application icon
-if((UNIX AND NOT APPLE) OR HAVE_KDE)
+
+# cmake-2.6.2 can't handle nested conditions
+# if((UNIX AND NOT APPLE) OR HAVE_KDE)
+if(HAVE_KDE OR UNIX)
+ if(HAVE_KDE OR NOT APPLE)
+
   install(FILES oxygen_kde/48x48/apps/quassel.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps)
   if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
     install(FILES oxygen_kde/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps)
   endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-endif((UNIX AND NOT APPLE) OR HAVE_KDE)
+
+# endif((UNIX AND NOT APPLE) OR HAVE_KDE)
+ endif(HAVE_KDE OR NOT APPLE)
+endif(HAVE_KDE OR UNIX)