diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-18 15:39:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-18 15:39:07 -0500 |
commit | 639b66b6769722b5decc8f7a21dd7c5037f3c65c (patch) | |
tree | cd93e26b01fe51b76b124b334057011c81974859 /swaybar/meson.build | |
parent | Merge pull request #3460 from emersion/output-enable-segfault (diff) | |
parent | meson: remove extraneous parentheses (diff) | |
download | sway-639b66b6769722b5decc8f7a21dd7c5037f3c65c.tar.gz sway-639b66b6769722b5decc8f7a21dd7c5037f3c65c.tar.zst sway-639b66b6769722b5decc8f7a21dd7c5037f3c65c.zip |
Merge pull request #3452 from emersion/meson-features
Use Meson feature options
Diffstat (limited to 'swaybar/meson.build')
-rw-r--r-- | swaybar/meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/swaybar/meson.build b/swaybar/meson.build index 312ca97b..b35f8169 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build | |||
@@ -1,4 +1,4 @@ | |||
1 | tray_files = get_option('enable-tray') ? [ | 1 | tray_files = have_tray ? [ |
2 | 'tray/host.c', | 2 | 'tray/host.c', |
3 | 'tray/icon.c', | 3 | 'tray/icon.c', |
4 | 'tray/item.c', | 4 | 'tray/item.c', |
@@ -19,7 +19,7 @@ swaybar_deps = [ | |||
19 | wayland_cursor, | 19 | wayland_cursor, |
20 | wlroots, | 20 | wlroots, |
21 | ] | 21 | ] |
22 | if get_option('enable-tray') | 22 | if have_tray |
23 | if systemd.found() | 23 | if systemd.found() |
24 | swaybar_deps += systemd | 24 | swaybar_deps += systemd |
25 | elif elogind.found() | 25 | elif elogind.found() |
@@ -42,6 +42,5 @@ executable( | |||
42 | include_directories: [sway_inc], | 42 | include_directories: [sway_inc], |
43 | dependencies: swaybar_deps, | 43 | dependencies: swaybar_deps, |
44 | link_with: [lib_sway_common, lib_sway_client], | 44 | link_with: [lib_sway_common, lib_sway_client], |
45 | install_rpath : rpathdir, | ||
46 | install: true | 45 | install: true |
47 | ) | 46 | ) |