Merge pull request #68 from jpnurmi/build-date

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb0cd29..26f967f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ if(USE_QT5)
             PURPOSE     "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments"
         )
         if (Qt5DBus_FOUND)
-            find_package(dbusmenu-qt5 QUIET)
+            find_package(dbusmenu-qt5 QUIET CONFIG)
             set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED
                 URL "https://launchpad.net/libdbusmenu-qt"
                 DESCRIPTION "a library implementing the DBusMenu specification"
@@ -187,16 +187,31 @@ if(USE_QT5)
             DESCRIPTION "a multimedia abstraction library"
             PURPOSE     "Required for audio notifications"
         )
+        
+        find_package(LibsnoreQt5 QUIET)
+        set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
+            URL "https://github.com/TheOneRing/Snorenotify"
+            DESCRIPTION "a cross-platform notification framework"
+            PURPOSE     "Enable support for the snorenotify framework"
+        )
 
         if (WITH_WEBKIT)
-            find_package(Qt5Webkit QUIET)
-            set_package_properties(Qt5Webkit PROPERTIES TYPE RECOMMENDED
+            find_package(Qt5WebKit QUIET)
+            set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
                 URL "http://qt.digia.com"
-                DESCRIPTION "a Webkit implementation for Qt"
+                DESCRIPTION "a WebKit implementation for Qt"
                 PURPOSE     "Needed for displaying previews for URLs in chat"
             )
+            if (Qt5WebKit_FOUND)
+                find_package(Qt5WebKitWidgets QUIET)
+                set_package_properties(Qt5WebKitWidgets PROPERTIES TYPE RECOMMENDED
+                    URL "http://qt.digia.com"
+                    DESCRIPTION "widgets for Qt's WebKit implementation"
+                    PURPOSE     "Needed for displaying previews for URLs in chat"
+                )
+            endif()
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" Qt5Webkit_FOUND "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
 
     endif(BUILD_GUI)
     if (BUILD_CORE)
@@ -243,7 +258,7 @@ else(USE_QT5)
     if (BUILD_GUI)
         add_feature_info("QtDBus module" QT_QTDBUS_FOUND "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments")
         if (QT_QTDBUS_FOUND)
-            find_package(libdbusmenu-qt QUIET)
+            find_package(dbusmenu-qt QUIET CONFIG)
             set_package_properties(dbusmenu-qt PROPERTIES TYPE RECOMMENDED
                 URL "https://launchpad.net/libdbusmenu-qt"
                 DESCRIPTION "a library implementing the DBusMenu specification"
@@ -254,7 +269,7 @@ else(USE_QT5)
         if (WITH_WEBKIT AND QT_QTWEBKIT_FOUND)
             set(HAVE_WEBKIT true)
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT and QtWebKit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
 
         if (WITH_KDE)
             # KDE has overzealous CFLAGS making miniz not compile, so save our old flags