diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-08-22 20:41:25 +1200 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-08-22 20:41:25 +1200 |
| commit | 560e96aa57dc746adcbd5297c3544edd16c0626e (patch) | |
| tree | 8f99d768404cfce072046d65d5ed0109476e0d84 | |
| parent | 784c20c82fb6fb84c5ce49993b5a2ec0bda13475 (diff) | |
Update rootston to use new option
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | rootston/meson.build | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meson.build b/meson.build index ff1a4ee8..004cab4a 100644 --- a/meson.build +++ b/meson.build @@ -161,14 +161,12 @@ summary = [ message('\n'.join(summary)) -if get_option('enable-rootston') - subdir('rootston') -endif - if get_option('enable-examples') subdir('examples') endif +subdir('rootston') + pkgconfig = import('pkgconfig') pkgconfig.generate( libraries: lib_wlr, diff --git a/meson_options.txt b/meson_options.txt index 854022e7..140459cb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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('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') diff --git a/rootston/meson.build b/rootston/meson.build index b461e1a0..9d1decce 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -11,8 +11,8 @@ sources = [ 'seat.c', 'virtual_keyboard.c', 'wl_shell.c', - 'xdg_shell_v6.c', 'xdg_shell.c', + 'xdg_shell_v6.c', ] if conf_data.get('WLR_HAS_XWAYLAND', false) @@ -20,5 +20,8 @@ if conf_data.get('WLR_HAS_XWAYLAND', false) endif executable( - 'rootston', sources, dependencies: [wlroots, wlr_protos, pixman] + 'rootston', + sources, + dependencies: [wlroots, wlr_protos, pixman], + build_by_default: get_option('rootston'), ) |