diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-02-27 16:01:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 16:01:27 -0500 |
| commit | 51d27d154950824228e91eb1af0374a21fe4e1c5 (patch) | |
| tree | 2e96973a01c2a780d032033558d99865a01fd975 | |
| parent | aea33551fb517a47533b87338da1ccb8a3f0c1a5 (diff) | |
| parent | 8228fa60d4e03b4b9f541cdc411d28c106cef2d3 (diff) | |
| download | sway-51d27d154950824228e91eb1af0374a21fe4e1c5.tar.xz | |
Merge pull request #3786 from emersion/wlroots-version
Set minimum wlroots version
| -rw-r--r-- | meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 3c3c1f41..3ba1e0c3 100644 --- a/meson.build +++ b/meson.build @@ -60,17 +60,19 @@ rt = cc.find_library('rt') git = find_program('git', required: false) # Try first to find wlroots as a subproject, then as a system dependency +wlroots_version = '>=0.4.1' wlroots_proj = subproject( 'wlroots', default_options: ['rootston=false', 'examples=false'], required: false, + version: wlroots_version, ) if wlroots_proj.found() wlroots = wlroots_proj.get_variable('wlroots') wlroots_conf = wlroots_proj.get_variable('conf_data') wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1 else - wlroots = dependency('wlroots') + wlroots = dependency('wlroots', version: wlroots_version) wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1' endif |