From 88c8f69a2f95f521cb20922a076448a0c3119a3f Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sun, 20 Oct 2019 17:17:20 +0200 Subject: [PATCH] clients: avoid build error without gl-renderer Make sure gl-renderer is enabled when building the EGL and EGL dmabuf clients. This avoids missing declaration warnings and linking errors such as: ../clients/simple-dmabuf-egl.c:1142: undefined reference to `weston_check_egl_extension ... ../clients/simple-egl.c:206: undefined reference to `weston_check_egl_extension' Signed-off-by: Stefan Agner --- clients/meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/clients/meson.build b/clients/meson.build index 93d94b1e..2ee44392 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -66,7 +66,8 @@ simple_clients = [ dep_libdrm, dep_libm ], - 'deps': [ 'egl', 'glesv2', 'gbm' ] + 'deps': [ 'egl', 'glesv2', 'gbm' ], + 'options': [ 'renderer-gl' ] }, { 'name': 'dmabuf-v4l', @@ -91,7 +92,8 @@ simple_clients = [ ivi_application_protocol_c, ], 'dep_objs': [ dep_wayland_client, dep_libshared, dep_libm ], - 'deps': [ 'egl', 'wayland-egl', 'glesv2', 'wayland-cursor' ] + 'deps': [ 'egl', 'wayland-egl', 'glesv2', 'wayland-cursor' ], + 'options': [ 'renderer-gl' ] }, # weston-simple-im is handled specially separately due to install_dir and odd window.h usage { @@ -130,6 +132,12 @@ foreach t : simple_clients t_deps += dep endforeach + foreach optname : t.get('options', []) + if not get_option(optname) + error('@0@ requires option @1@ which is not enabled. If you rather not build this, drop "@2@" from simple-clients option.'.format(t_name, optname, t.get('name'))) + endif + endforeach + executable( t_name, t.get('sources'), include_directories: common_inc, -- 2.34.1