diff options
| author | Tobias Blass <tobiasblass@t-online.de> | 2017-07-20 22:14:32 +0200 |
|---|---|---|
| committer | Tobias Blass <tobiasblass@t-online.de> | 2017-07-20 23:03:16 +0200 |
| commit | 8976a47f629dd2af65c6fabaff736e13d80a270b (patch) | |
| tree | f069574851afa50bff3d8edeabe8f9790352faab | |
| parent | 1e13a1fd60dac491a82670826f9960d0b6f8cf7b (diff) | |
| download | sway-8976a47f629dd2af65c6fabaff736e13d80a270b.tar.xz | |
[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.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swaybar/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a4bf351b..459eeb04 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 373719de..48ededdd 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 ) |