blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update rootston to use new option

This commit is contained in:
Scott Anderson 2018-08-22 20:41:25 +12:00
parent 784c20c82f
commit 560e96aa57
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -161,14 +161,12 @@ summary = [
message('\n'.join(summary)) message('\n'.join(summary))
if get_option('enable-rootston')
subdir('rootston')
endif
if get_option('enable-examples') if get_option('enable-examples')
subdir('examples') subdir('examples')
endif endif
subdir('rootston')
pkgconfig = import('pkgconfig') pkgconfig = import('pkgconfig')
pkgconfig.generate( pkgconfig.generate(
libraries: lib_wlr, libraries: lib_wlr,

1
meson_options.txt
View File

@ -1,4 +1,3 @@
option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
option('enable-examples', type: 'boolean', value: true, description: 'Build example applications') option('enable-examples', type: 'boolean', value: true, description: 'Build example applications')
option('libcap', type: 'feature', value: 'auto', description: 'Enable support for rootless session via capabilities (cap_sys_admin)') option('libcap', type: 'feature', value: 'auto', description: 'Enable support for rootless session via capabilities (cap_sys_admin)')
option('logind', type: 'feature', value: 'auto', description: 'Enable support for rootless session via logind') option('logind', type: 'feature', value: 'auto', description: 'Enable support for rootless session via logind')

7
rootston/meson.build
View File

@ -11,8 +11,8 @@ sources = [
'seat.c', 'seat.c',
'virtual_keyboard.c', 'virtual_keyboard.c',
'wl_shell.c', 'wl_shell.c',
'xdg_shell_v6.c',
'xdg_shell.c', 'xdg_shell.c',
'xdg_shell_v6.c',
] ]
if conf_data.get('WLR_HAS_XWAYLAND', false) if conf_data.get('WLR_HAS_XWAYLAND', false)
@ -20,5 +20,8 @@ if conf_data.get('WLR_HAS_XWAYLAND', false)
endif endif
executable( executable(
'rootston', sources, dependencies: [wlroots, wlr_protos, pixman] 'rootston',
sources,
dependencies: [wlroots, wlr_protos, pixman],
build_by_default: get_option('rootston'),
) )