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 b3d70ad..f516018 100644 (file)
--- 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)
   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)
       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)
 
 if(WANT_MONO OR WANT_QTCLIENT)
   if(EMBED_DATA)

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 085ca92..3eaea88 100644 (file)
--- 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
 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")
   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)