diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-07-20 19:43:48 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-20 19:43:48 -0400 |
| commit | 47754642f8dd57b26d862f74f732b6c4a43ca23f (patch) | |
| tree | f069574851afa50bff3d8edeabe8f9790352faab | |
| parent | Merge pull request #1283 from 4e554c4c/memory_leak (diff) | |
| parent | [swaybar] fix non-dbus build (diff) | |
| download | sway-47754642f8dd57b26d862f74f732b6c4a43ca23f.tar.gz sway-47754642f8dd57b26d862f74f732b6c4a43ca23f.tar.zst sway-47754642f8dd57b26d862f74f732b6c4a43ca23f.zip | |
Merge pull request #1285 from tobiasblass/fix_non_dbus_build
[swaybar] fix non-dbus build
| -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() | |||
| 95 | 95 | ||
| 96 | if (enable-tray) | 96 | if (enable-tray) |
| 97 | if (DBUS_FOUND) | 97 | if (DBUS_FOUND) |
| 98 | set(ENABLE_TRAY) | 98 | set(ENABLE_TRAY TRUE) |
| 99 | add_definitions(-DENABLE_TRAY) | 99 | add_definitions(-DENABLE_TRAY) |
| 100 | else() | 100 | else() |
| 101 | message(WARNING "Tray required but DBus was not found. Tray will not be included") | 101 | 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( | |||
| 7 | ${XKBCOMMON_INCLUDE_DIRS} | 7 | ${XKBCOMMON_INCLUDE_DIRS} |
| 8 | ${DBUS_INCLUDE_DIRS} | 8 | ${DBUS_INCLUDE_DIRS} |
| 9 | ) | 9 | ) |
| 10 | if (enable-tray) | 10 | if (ENABLE_TRAY) |
| 11 | file(GLOB tray | 11 | file(GLOB tray |
| 12 | tray/*.c | 12 | tray/*.c |
| 13 | ) | 13 | ) |