X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=86ec6158be8c9a055f9350b11b547fd82baffeab;hp=cb040e06cc1bcd522a01934d99e120900137b886;hb=979a6d7363b0ccf9db3441f5c668d99ac34a8e44;hpb=2273a95ba9c277ce6dd7a67158a3d3ed9f161182 diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt index cb040e06..86ec6158 100644 --- a/src/qtui/CMakeLists.txt +++ b/src/qtui/CMakeLists.txt @@ -110,7 +110,11 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND) if (dbusmenu-qt_FOUND OR dbusmenu-qt5_FOUND) add_definitions(-DHAVE_DBUSMENU) include_directories(${dbusmenu-qt_INCLUDE_DIRS} ${dbusmenu-qt5_INCLUDE_DIRS}) - list(APPEND LIBS ${dbusmenu-qt_LIBRARIES} ${dbusmenu-qt5_LIBRARIES}) + if (dbusmenu-qt_FOUND) + list(APPEND LIBS dbusmenu-qt) + else() + list(APPEND LIBS dbusmenu-qt5) + endif() endif() list(APPEND SOURCES statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp) @@ -119,9 +123,12 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND) qt_add_dbus_adaptor (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus) endif() -if (QT_QTWEBKIT_FOUND OR Qt5Webkit_FOUND) +if (QT_QTWEBKIT_FOUND OR Qt5WebKitWidgets_FOUND) add_definitions(-DHAVE_WEBKIT) - list(APPEND QT_MODULES Webkit XmlPatterns) + list(APPEND QT_MODULES WebKit XmlPatterns) + if (USE_QT5) + list(APPEND QT_MODULES WebKitWidgets) + endif() endif() if(HAVE_SSL)