From 6bcfc43a886bf5d9f96f13b2202c1f6dffd09fc4 Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Fri, 21 Oct 2022 11:36:18 +0200 Subject: [PATCH] clients/screenshot: build screenshooter with kiosk-shell and fullscreen-shell The output capture protocol is also provided by the kiosk shell and the fullscreen shell. Therefore, the weston-screenshooter to take screenshots should be built if the desktop shell is disabled, too. Signed-off-by: Michael Tretter --- clients/meson.build | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/clients/meson.build b/clients/meson.build index b5f09ba4..75b4121f 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -361,6 +361,20 @@ if get_option('shell-desktop') ) env_modmap += 'weston-keyboard=@0@;'.format(exe_keyboard.full_path()) + exe_shell_desktop = executable( + 'weston-desktop-shell', + 'desktop-shell.c', + weston_desktop_shell_client_protocol_h, + weston_desktop_shell_protocol_c, + include_directories: common_inc, + dependencies: dep_toytoolkit, + install_dir: get_option('libexecdir'), + install: true + ) + env_modmap += 'weston-desktop-shell=@0@;'.format(exe_shell_desktop.full_path()) +endif + +if get_option('shell-desktop') or get_option('shell-fullscreen') or get_option('shell-kiosk') exe_shooter = executable( 'weston-screenshooter', 'screenshot.c', @@ -376,21 +390,8 @@ if get_option('shell-desktop') install: true ) env_modmap += 'weston-screenshooter=@0@;'.format(exe_shooter.full_path()) - - exe_shell_desktop = executable( - 'weston-desktop-shell', - 'desktop-shell.c', - weston_desktop_shell_client_protocol_h, - weston_desktop_shell_protocol_c, - include_directories: common_inc, - dependencies: dep_toytoolkit, - install_dir: get_option('libexecdir'), - install: true - ) - env_modmap += 'weston-desktop-shell=@0@;'.format(exe_shell_desktop.full_path()) endif - if get_option('shell-ivi') exe_shell_ivi_ui = executable( 'weston-ivi-shell-user-interface',