Unhide buffer when joining or querying and it was temporarily hidden. fixes #866

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0a34c0..2e5faf0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,19 @@ if(BUILD_GUI)
       set(CLIENT_QT4_VARS ${CLIENT_QT4_VARS} DBUS)
       set(CLIENT_COMPILE_FLAGS "${CLIENT_COMPILE_FLAGS} -DQT_DBUS_LIB")
       set(HAVE_DBUS true)
+
+      # check if we have dbusmenu as well
+      find_package(DBusMenuQt)
+      if(DBUSMENUQT_FOUND)
+        message(STATUS "Enabling support for exporting the tray menu via D-Bus")
+        add_definitions(-DHAVE_DBUSMENU)
+        include_directories(${DBUSMENUQT_INCLUDE_DIR})
+        set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${DBUSMENUQT_LIBRARIES})
+        set(CLIENT_COMPILE_FLAGS "${CLIENT_COMPILE_FLAGS} ${DBUSMENUQT_DEFINITIONS}")
+      else(DBUSMENUQT_FOUND)
+        message(STATUS "Disabling support for exporting the tray menu via D-Bus")
+      endif(DBUSMENUQT_FOUND)
+
     else(QT_QTDBUS_FOUND)
       message(STATUS "QtDBus not found, disabling D-Bus support")
     endif(QT_QTDBUS_FOUND)
@@ -235,7 +248,7 @@ if(BUILD_GUI)
       include_directories(${KDE4_INCLUDES})
       add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
       set(HAVE_KDE 1)
-      set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_SOLID_LIBS} knotifyconfig)
+      set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_SOLID_LIBS} knotifyconfig)
       # We always use external icons for KDE4 support, since we use its iconloader rather than our own
       set(EMBED_DATA OFF)
     else(KDE4_FOUND)
@@ -252,6 +265,8 @@ if(BUILD_GUI)
       if(PHONON_FOUND)
         message(STATUS "Enabling Phonon support")
         add_definitions(-DHAVE_PHONON)
+        include_directories(${PHONON_INCLUDES})
+        set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${PHONON_LIBS})
         set(HAVE_PHONON true)
       else(PHONON_FOUND)
         message(STATUS "Phonon not found, disabling audio notifications")
@@ -268,6 +283,8 @@ if(BUILD_GUI)
       message(STATUS "Enabling Ayatana notification support")
       set(HAVE_INDICATEQT true)
       add_definitions(-DHAVE_INDICATEQT)
+      link_directories(${INDICATEQT_LIBRARY_DIRS})
+      set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${INDICATEQT_LIBRARIES})
     else(INDICATEQT_FOUND)
       message(STATUS "Disabling Ayatana notification support")
     endif(INDICATEQT_FOUND)