From 8976a47f629dd2af65c6fabaff736e13d80a270b Mon Sep 17 00:00:00 2001 From: Tobias Blass Date: Thu, 20 Jul 2017 22:14:32 +0200 Subject: [PATCH] [swaybar] fix non-dbus build Swaybar's CMakeLists.txt uses the enable-tray option directly to decide whether to build the tray. This leads to a compilation error if dbus is not installed. This patch uses the ENABLE_TRAY variable instead, which is only true if the user enabled the tray *and* dbus is available. --- CMakeLists.txt | 2 +- swaybar/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4bf351b0..459eeb04b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ endif() if (enable-tray) if (DBUS_FOUND) - set(ENABLE_TRAY) + set(ENABLE_TRAY TRUE) add_definitions(-DENABLE_TRAY) else() message(WARNING "Tray required but DBus was not found. Tray will not be included") diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 373719de4..48ededddb 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${XKBCOMMON_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} ) -if (enable-tray) +if (ENABLE_TRAY) file(GLOB tray tray/*.c )