alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3786 from emersion/wlroots-version

Browse source 
Set minimum wlroots version
This commit is contained in:
Drew DeVault 2019-02-27 16:01:27 -05:00 committed by GitHub
parent aea33551fb 8228fa60d4
commit 51d27d1549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -60,17 +60,19 @@ rt = cc.find_library('rt')
git = find_program('git', required: false) git = find_program('git', required: false)
# Try first to find wlroots as a subproject, then as a system dependency # Try first to find wlroots as a subproject, then as a system dependency
wlroots_version = '>=0.4.1'
wlroots_proj = subproject( wlroots_proj = subproject(
'wlroots', 'wlroots',
default_options: ['rootston=false', 'examples=false'], default_options: ['rootston=false', 'examples=false'],
required: false, required: false,
version: wlroots_version,
) )
if wlroots_proj.found() if wlroots_proj.found()
wlroots = wlroots_proj.get_variable('wlroots') wlroots = wlroots_proj.get_variable('wlroots')
wlroots_conf = wlroots_proj.get_variable('conf_data') wlroots_conf = wlroots_proj.get_variable('conf_data')
wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1 wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1
else 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' wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
endif endif