Make BacklogSettingsPage use the new automatic child widget handling

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c473282..1e37224 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,15 +54,12 @@ if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
   set(OXYGEN_ICONS "Builtin")
   set(QUASSEL_ICONS "Builtin")
+  set(WITH_KDE OFF)
 endif(STATIC)
 
-# RPATH needs to be set correctly
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) 
-set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
-
 # Define install locations. Using variables will allow overriding this by the KDE macros later.
 set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps/quassel)
+set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps)
 set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
 set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
 
@@ -148,27 +145,12 @@ if(WITH_WEBKIT)
     set(HAVE_WEBKIT true)
     set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_WEBKIT)
   else(QT_QTWEBKIT_FOUND)
-    message(STATUS "QtWebKit not found, disabling D-Bus support")
+    message(STATUS "QtWebKit not found, disabling WebKit support")
   endif(QT_QTWEBKIT_FOUND)
 else(WITH_WEBKIT)
   message(STATUS "Disabling WebKit support")
 endif(WITH_WEBKIT)
 
-# Setup Phonon support
-if(WITH_PHONON)
-  find_package(Phonon)
-  if(PHONON_FOUND)
-    message(STATUS "Enabling Phonon support")
-    add_definitions(-DHAVE_PHONON)
-    set(HAVE_PHONON true)
-    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_PHONON)
-  else(PHONON_FOUND)
-    message(STATUS "Phonon not found, disabling audio notifications")
-  endif(PHONON_FOUND)
-else(WITH_PHONON)
-  message(STATUS "Disabling Phonon support")
-endif(WITH_PHONON)
-
 # Setup KDE4 support
 if(WITH_KDE)
   find_package(KDE4)
@@ -178,8 +160,10 @@ if(WITH_KDE)
     add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
     set(HAVE_KDE 1)
     set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_KDE)
-    set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY})
+    set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} knotifyconfig)
+    # We always use external icons for KDE4 support, since we use its iconloader rather than our own
     set(OXYGEN_ICONS "External")
+    set(QUASSEL_ICONS "External")
   else(KDE4_FOUND)
     message(STATUS "KDE4 not found, disabling KDE integration")
   endif(KDE4_FOUND)
@@ -187,6 +171,28 @@ else(WITH_KDE)
   message(STATUS "Disabling KDE4 integration")
 endif(WITH_KDE)
 
+# Setup Phonon support - we only need this if we don't have or want KDE4
+if(NOT HAVE_KDE)
+  if(WITH_PHONON)
+    find_package(Phonon)
+    if(PHONON_FOUND)
+      message(STATUS "Enabling Phonon support")
+      add_definitions(-DHAVE_PHONON)
+      set(HAVE_PHONON true)
+      set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_PHONON)
+    else(PHONON_FOUND)
+      message(STATUS "Phonon not found, disabling audio notifications")
+    endif(PHONON_FOUND)
+  else(WITH_PHONON)
+    message(STATUS "Disabling Phonon support")
+  endif(WITH_PHONON)
+endif(NOT HAVE_KDE)
+
+# RPATH needs to be set correctly
+# Do this down here, since otherwise KDE wants to handle it itself, and fails
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
 # Set global buildflags
 # This is very much non-portable, so don't use -DSTATIC until you know what
 # you do.
@@ -236,7 +242,7 @@ if(WANT_QTCLIENT OR WANT_MONO)
   endif(QUASSEL_ICONS MATCHES "External")
 
   if(OXYGEN_ICONS MATCHES "External")
-    message(STATUS "Use system-installed Oxygen icon theme")
+    message(STATUS "Use system-installed icon theme")
   else(OXYGEN_ICONS MATCHES "External")
     set(OXYGEN_ICONS "Builtin")
     message(STATUS "Compile Oxygen icon theme subset into the binary")