| Message ID | 20231023113047.2572137-15-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Make Pixman an optional dependency | expand |
On 23/10/2023 13.30, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > meson.build | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 3d6e41d1fb..dbc7af091c 100644 > --- a/meson.build > +++ b/meson.build > @@ -1507,7 +1507,11 @@ gtkx11 = not_found > vte = not_found > have_gtk_clipboard = get_option('gtk_clipboard').enabled() > > -if not get_option('gtk').auto() or have_system > +if get_option('gtk') \ > + .disable_auto_if(not have_system) \ > + .require(pixman.found(), > + error_message: 'cannot enable GTK if pixman is not available') \ > + .allowed() > gtk = dependency('gtk+-3.0', version: '>=3.22.0', > method: 'pkg-config', > required: get_option('gtk')) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/meson.build b/meson.build index 3d6e41d1fb..dbc7af091c 100644 --- a/meson.build +++ b/meson.build @@ -1507,7 +1507,11 @@ gtkx11 = not_found vte = not_found have_gtk_clipboard = get_option('gtk_clipboard').enabled() -if not get_option('gtk').auto() or have_system +if get_option('gtk') \ + .disable_auto_if(not have_system) \ + .require(pixman.found(), + error_message: 'cannot enable GTK if pixman is not available') \ + .allowed() gtk = dependency('gtk+-3.0', version: '>=3.22.0', method: 'pkg-config', required: get_option('gtk'))