From 0ac7d74296835deb853a39f4804ca7583374751a Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Sat, 11 Jun 2016 14:48:27 +0200 Subject: [PATCH] Disable dbus on Windows. Closes GH-212. --- CMakeLists.txt | 26 ++++++++++++++------------ appveyor.yml | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75c4d577..5a1291d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,19 +203,21 @@ if (USE_QT5) DESCRIPTION "the widgets module for Qt5" ) - find_package(Qt5DBus QUIET) - set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED - URL "http://qt.digia.com" - DESCRIPTION "D-Bus support for 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 CONFIG) - set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED - URL "https://launchpad.net/libdbusmenu-qt" - DESCRIPTION "a library implementing the DBusMenu specification" - PURPOSE "Required for having a context menu for the D-Bus-based tray icon" + if (NOT WIN32) + find_package(Qt5DBus QUIET) + set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED + URL "http://qt.digia.com" + DESCRIPTION "D-Bus support for 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 CONFIG) + set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED + URL "https://launchpad.net/libdbusmenu-qt" + DESCRIPTION "a library implementing the DBusMenu specification" + PURPOSE "Required for having a context menu for the D-Bus-based tray icon" + ) + endif() endif() find_package(Qt5Multimedia QUIET) diff --git a/appveyor.yml b/appveyor.yml index 7ad3629b..2f228b9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ build_script: $webPrevFiles = @() } - LogExec cmake -G"Ninja" $env:APPVEYOR_BUILD_FOLDER -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT" -DUSE_QT5=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=ON $webPrevOption + LogExec cmake -G"Ninja" $env:APPVEYOR_BUILD_FOLDER -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT" -DUSE_QT5=ON $webPrevOption CmakeImageInstall $whitelist = @( -- 2.20.1