Properly handle DBusMenuQt in the build system

This library ships a CMake config file these days, so we can remove
our own find script (which was no longer used anyway). Also, we need to
treat it as an imported target, there's no dbusmenu-qt_LIBRARIES...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb0cd29..47a672e 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"
@@ -243,7 +243,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"

diff --git a/cmake/FindDBusMenuQt.cmake b/cmake/FindDBusMenuQt.cmake
deleted file mode 100644 (file)
index 5af70ef..0000000
--- a/cmake/FindDBusMenuQt.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# - Try to find dbusmenu-qt
-# This module helps finding an installation of the DBusMenuQt library (see https://launchpad.net/libdbusmenu-qt/)
-# Once done this will define
-#
-#  DBUSMENUQT_FOUND - system has dbusmenu-qt
-#  DBUSMENUQT_INCLUDE_DIR - the dbusmenu-qt include directory
-#  DBUSMENUQT_LIBRARIES - the libraries needed to use dbusmenu-qt
-#  DBUSMENUQT_DEFINITIONS - Compiler switches required for using dbusmenu-qt
-#
-# The minimum required version of DBusMenuQt can be specified using the
-# standard syntax, e.g. find_package(DBusMenuQt 0.6)
-#
-# WARNING: versions below 0.4.0 cannot be checked for.
-# So if you want to have a version check, require at least 0.4.0 of dbusmenuqt.
-
-# Copyright (c) 2009, Canonical Ltd.
-# - Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
-#
-# Based on FindQCA2.cmake
-# Copyright (c) 2006, Michael Larouche, <michael.larouche@kdemail.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig)
-pkg_check_modules(PC_DBUSMENUQT QUIET dbusmenu-qt)
-
-
-set(DBUSMENUQT_DEFINITIONS ${PC_DBUSMENUQT_CFLAGS_OTHER})
-
-find_library(DBUSMENUQT_LIBRARIES
-    NAMES dbusmenu-qt dbusmenu-qtd
-    HINTS ${PC_DBUSMENUQT_LIBDIR} ${PC_DBUSMENUQT_LIBRARY_DIRS}
-    )
-
-find_path(DBUSMENUQT_INCLUDE_DIR dbusmenuexporter.h
-    HINTS ${PC_DBUSMENUQT_INCLUDEDIR} ${PC_DBUSMENUQT_INCLUDE_DIRS}
-    PATH_SUFFIXES dbusmenu-qt
-    )
-
-
-# dbusmenu_version.h is installed since 0.4.0, fail if a version below this is required:
-if ((DBusMenuQt_FIND_VERSION)  AND ("${DBusMenuQt_FIND_VERSION}" VERSION_LESS "0.4.0"))
-  message(FATAL_ERROR "Cannot check reliably for a DBusMenuQt version below 0.4.0 (${DBusMenuQt_FIND_VERSION} was requested)")
-endif ((DBusMenuQt_FIND_VERSION)  AND ("${DBusMenuQt_FIND_VERSION}" VERSION_LESS "0.4.0"))
-
-
-# find the version number from dbusmenu_version.h and store it in the cache
-if(DBUSMENUQT_INCLUDE_DIR  AND NOT DBUSMENUQT_VERSION)
-  # parse the version number out from dbusmenu_version:
-  if(EXISTS ${DBUSMENUQT_INCLUDE_DIR}/dbusmenu_version.h)
-    file(READ "${DBUSMENUQT_INCLUDE_DIR}/dbusmenu_version.h" DBUSMENUQT_VERSION_CONTENT)
-
-    if ("${DBUSMENUQT_VERSION_CONTENT}" MATCHES "DBUSMENUQT_VERSION_MAJOR") # introduced after 0.6.4, makes this code here more robust
-
-     string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MAJOR +([0-9]+)"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-     set(DBUSMENUQT_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MINOR +([0-9]+)"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-      set(DBUSMENUQT_VERSION_MINOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "#define +DBUSMENUQT_VERSION_PATCH +([0-9]+)"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-      set(DBUSMENUQT_VERSION_PATCH "${CMAKE_MATCH_1}")
-
-    else("${DBUSMENUQT_VERSION_CONTENT}" MATCHES "DBUSMENUQT_VERSION_MAJOR")
-      # In versions up to 0.6.4, the code for setting the version number in the header looked like
-      # shopw below. This made version checking quite un-obvious:
-      # #define DBUSMENUQT_VERSION \
-      #     ((0 << 16) \
-      #     |(6 << 8) \
-      #     |4)
-
-      string(REGEX MATCH "\\(\\( *([0-9]+) *<<"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-      set(DBUSMENUQT_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "\\|\\( *([0-9]+) *<<"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-      set(DBUSMENUQT_VERSION_MINOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "\\| *([0-9]+) *\\)"  _dummy "${DBUSMENUQT_VERSION_CONTENT}")
-      set(DBUSMENUQT_VERSION_PATCH "${CMAKE_MATCH_1}")
-    endif("${DBUSMENUQT_VERSION_CONTENT}" MATCHES "DBUSMENUQT_VERSION_MAJOR")
-  endif(EXISTS ${DBUSMENUQT_INCLUDE_DIR}/dbusmenu_version.h)
-
-  set(DBUSMENUQT_VERSION "${DBUSMENUQT_VERSION_MAJOR}.${DBUSMENUQT_VERSION_MINOR}.${DBUSMENUQT_VERSION_PATCH}" CACHE STRING "Version number of DBusMenuQt" FORCE)
-endif(DBUSMENUQT_INCLUDE_DIR  AND NOT DBUSMENUQT_VERSION)
-
-
-find_package_handle_standard_args(DBusMenuQt REQUIRED_VARS DBUSMENUQT_LIBRARIES DBUSMENUQT_INCLUDE_DIR
-                                             VERSION_VAR DBUSMENUQT_VERSION)
-#"Could not find dbusmenu-qt; available at https://launchpad.net/libdbusmenu-qt/" DBUSMENUQT_LIBRARIES DBUSMENUQT_INCLUDE_DIR)
-
-mark_as_advanced(DBUSMENUQT_INCLUDE_DIR DBUSMENUQT_LIBRARIES DBUSMENUQT_VERSION)

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index cb040e0..5c7371e 100644 (file)
--- 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)