mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: allow using subproject for wlroots

Browse source 
This is handy when testing cage with a newer wlroots copy, or
when developing cage and wlroots patches in parallel.
This commit is contained in:
Simon Ser 2021-08-09 20:29:18 +02:00 • committed by Jente Hidskes
parent 5424a35aba
commit 1a3ab3eb3a
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -34,7 +34,7 @@ if is_freebsd
) )
endif endif
wlroots = dependency('wlroots', version: '>= 0.14.0') wlroots = dependency('wlroots', version: '>= 0.14.0', fallback: ['wlroots', 'wlroots'])
wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
pixman = dependency('pixman-1') pixman = dependency('pixman-1')
@ -65,12 +65,11 @@ server_protos = declare_dependency(
) )
if get_option('xwayland') if get_option('xwayland')
wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1' wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
if not wlroots_has_xwayland if not wlroots_has_xwayland
error('Cannot build Cage with XWayland support: wlroots has been built without it') error('Cannot build Cage with XWayland support: wlroots has been built without it')
else
have_xwayland = true
endif endif
have_xwayland = true
else else
have_xwayland = false have_xwayland = false
endif endif