From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 27 Feb 2010 17:54:32 +0000 (+0100)
Subject: Fix building with cmake-2.6.2
X-Git-Tag: 0.6-rc1~29
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=22d79ae4d680a3532b64c91440c02b53c81fdf36;hp=8802aa034ebb6cee594fe37042a3f3265dcc6726

Fix building with cmake-2.6.2

Can't do nested conditions in IF() yet, so we need to split them up.
---

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index b3d70adf..f516018c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,7 @@
-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)
   if(WANT_QTCLIENT)
     install(FILES quasselclient.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
   endif(WANT_QTCLIENT)
@@ -12,7 +15,10 @@ if((UNIX AND NOT APPLE) OR HAVE_KDE)
       install(FILES quassel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/quassel)
     endif(HAVE_KDE)
   endif(WANT_MONO OR WANT_QTCLIENT)
-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)
 
 if(WANT_MONO OR WANT_QTCLIENT)
   if(EMBED_DATA)
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)