1
0
Fork 0

build: Make GTK dependency specific to X11

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2407>
This commit is contained in:
Bilal Elmoussaoui 2022-05-26 15:05:02 +02:00
parent 4d7aedf90a
commit 8b42bc77dc
4 changed files with 13 additions and 7 deletions

View file

@ -106,8 +106,6 @@ mutter_installed_tests_libexecdir = join_paths(
m_dep = cc.find_library('m', required: true)
graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req)
gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
gtk4_dep = dependency('gtk4', version: gtk4_req)
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
pango_dep = dependency('pango', version: pango_req)
cairo_dep = dependency('cairo', version: cairo_req)
@ -146,6 +144,9 @@ if not have_wayland and not have_x11
endif
if have_x11_client
gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
gtk4_dep = dependency('gtk4', version: gtk4_req)
x11_dep = dependency('x11', version: x11_req)
xcomposite_dep = dependency('xcomposite', version: xcomposite_req)
xcursor_dep = dependency('xcursor')

View file

@ -10,7 +10,6 @@ default_plugin = shared_module('default',
c_args: default_plugin_c_args,
dependencies: [
glib_dep,
gtk3_dep,
json_glib_dep,
gsettings_desktop_schemas_dep,
libmutter_clutter_dep,

View file

@ -17,7 +17,6 @@ mutter_pkg_deps = [
gio_unix_dep,
glib_dep,
gsettings_desktop_schemas_dep,
gtk3_dep,
pango_dep,
]
@ -91,6 +90,12 @@ if have_introspection
]
endif
if have_x11_client
mutter_pkg_deps += [
gtk3_dep,
]
endif
if have_x11
mutter_pkg_deps += [
xfixes_dep,
@ -1150,8 +1155,6 @@ if have_introspection
includes: [
'GObject-2.0',
'GDesktopEnums-3.0',
'Gdk-3.0',
'Gtk-3.0',
'xlib-2.0',
'xfixes-4.0',
libmutter_cogl_gir[0],
@ -1185,7 +1188,9 @@ pkg.generate(libmutter,
)
subdir('compositor/plugins')
subdir('frames')
if have_x11_client
subdir('frames')
endif
if have_core_tests
subdir('tests')

View file

@ -34,6 +34,7 @@
#include "x11/meta-x11-display-private.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <stdlib.h>
#include <string.h>