diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-02-16 22:57:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-16 22:57:42 +0100 |
commit | 0bafc55176f97d2c5d991e8e5fb0e11a989b88d2 (patch) | |
tree | 0b907b10ec130b25944fdf8d4ec99c8e7bc5b80e | |
parent | tray: fix memory leaks (diff) | |
parent | Disable unneeded wlroots subproject features (diff) | |
download | sway-0bafc55176f97d2c5d991e8e5fb0e11a989b88d2.tar.gz sway-0bafc55176f97d2c5d991e8e5fb0e11a989b88d2.tar.zst sway-0bafc55176f97d2c5d991e8e5fb0e11a989b88d2.zip |
Merge pull request #3701 from emersion/meson-subproject-disable-unneeded
Disable unneeded wlroots subproject features
-rw-r--r-- | meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 2336a148..cfd77ce7 100644 --- a/meson.build +++ b/meson.build | |||
@@ -60,7 +60,11 @@ rt = cc.find_library('rt') | |||
60 | git = find_program('git', required: false) | 60 | git = find_program('git', required: false) |
61 | 61 | ||
62 | # Try first to find wlroots as a subproject, then as a system dependency | 62 | # Try first to find wlroots as a subproject, then as a system dependency |
63 | wlroots_proj = subproject('wlroots', required: false) | 63 | wlroots_proj = subproject( |
64 | 'wlroots', | ||
65 | default_options: ['rootston=disabled', 'examples=disabled'], | ||
66 | required: false, | ||
67 | ) | ||
64 | if wlroots_proj.found() | 68 | if wlroots_proj.found() |
65 | wlroots = wlroots_proj.get_variable('wlroots') | 69 | wlroots = wlroots_proj.get_variable('wlroots') |
66 | wlroots_conf = wlroots_proj.get_variable('conf_data') | 70 | wlroots_conf = wlroots_proj.get_variable('conf_data') |