From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 11 Oct 2009 21:29:38 +0000 (+0200)
Subject: Build with deprecated cmake versions
X-Git-Tag: 0.5.0~3
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=92f9da90bef2028ce4618a00063517a235ce78c6

Build with deprecated cmake versions

Simplified the conditionals a bit. Thanks to DeepDiver for pointing this out.

Fixes #820.
---

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 49066d3f..1ce26c91 100644
--- 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)