From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 24 Mar 2014 18:24:57 +0000 (+0100)
Subject: Clean up and fix data/CMakeLists.txt
X-Git-Tag: 0.11.0~85
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=04fdfa203d55fac925d0d5ef5a4cfd7ca91ca013

Clean up and fix data/CMakeLists.txt

This was forgotten during the recent changes and still referred to
HAVE_KDE, thus failing now. Taking the opportunity to clean up this
ancient cruft as well (those conditionals...)
---

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index f516018c..e795e66b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,35 +1,26 @@
-# 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 (BUILD_GUI)
+    if (KDE4_FOUND OR (UNIX AND NOT APPLE))
+        if (WANT_QTCLIENT)
+            install(FILES quasselclient.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+        endif()
 
-  if(WANT_MONO)
-    install(FILES quassel.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-  endif(WANT_MONO)
+        if (WANT_MONO)
+            install(FILES quassel.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+        endif()
 
-  if(WANT_MONO OR WANT_QTCLIENT)
-    if(HAVE_KDE)
-      install(FILES quassel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/quassel)
-    endif(HAVE_KDE)
-  endif(WANT_MONO OR WANT_QTCLIENT)
+        if (KDE4_FOUND)
+            install(FILES quassel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/quassel)
+        endif()
+    endif()
 
-# endif((UNIX AND NOT APPLE) OR HAVE_KDE)
- endif(HAVE_KDE OR NOT APPLE)
-endif(HAVE_KDE OR UNIX)
+    if (EMBED_DATA)
+        set(CLIENT_RCS ${CLIENT_RCS} ../data/data.qrc PARENT_SCOPE)
+    else()
+        install(FILES networks.ini DESTINATION ${DATA_INSTALL_DIR}/quassel)
+        install(DIRECTORY stylesheets DESTINATION ${DATA_INSTALL_DIR}/quassel)
+    endif()
 
-if(WANT_MONO OR WANT_QTCLIENT)
-  if(EMBED_DATA)
-    set(CLIENT_RCS ${CLIENT_RCS} ../data/data.qrc PARENT_SCOPE)
-  else(EMBED_DATA)
-    install(FILES networks.ini DESTINATION ${DATA_INSTALL_DIR}/quassel)
-    install(DIRECTORY stylesheets DESTINATION ${DATA_INSTALL_DIR}/quassel)
-  endif(EMBED_DATA)
-
-  if(NOT WIN32)
-    install(DIRECTORY scripts DESTINATION ${DATA_INSTALL_DIR}/quassel USE_SOURCE_PERMISSIONS)
-  endif(NOT WIN32)
-
-endif(WANT_MONO OR WANT_QTCLIENT)
+    if (NOT WIN32)
+        install(DIRECTORY scripts DESTINATION ${DATA_INSTALL_DIR}/quassel USE_SOURCE_PERMISSIONS)
+    endif()
+endif()