[mutter/bilelmoussaoui/gdk-x11-only: 5/6] build: Make GTK dependency specific to X11
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/gdk-x11-only: 5/6] build: Make GTK dependency specific to X11
- Date: Fri, 27 May 2022 14:08:03 +0000 (UTC)
commit 2821f653b4928f05e07a6017f0a7009e8dd5d80e
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Thu May 26 15:05:02 2022 +0200
build: Make GTK dependency specific to X11
meson.build | 3 ++-
src/compositor/plugins/meson.build | 1 -
src/meson.build | 9 ++++++---
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 49e66e717d..5e44a0b479 100644
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,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)
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
pango_dep = dependency('pango', version: pango_req)
cairo_dep = dependency('cairo', version: cairo_req)
@@ -140,6 +139,8 @@ if not have_wayland and not have_x11
endif
if have_x11_client
+ gtk3_dep = dependency('gtk+-3.0', version: gtk3_req)
+
x11_dep = dependency('x11')
xcomposite_dep = dependency('xcomposite', version: xcomposite_req)
xcursor_dep = dependency('xcursor')
diff --git a/src/compositor/plugins/meson.build b/src/compositor/plugins/meson.build
index 9dd06814d9..fadb9fadc5 100644
--- a/src/compositor/plugins/meson.build
+++ b/src/compositor/plugins/meson.build
@@ -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,
diff --git a/src/meson.build b/src/meson.build
index 42d7a5a55f..2aac54da0b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -17,7 +17,6 @@ mutter_pkg_deps = [
gio_unix_dep,
glib_dep,
gsettings_desktop_schemas_dep,
- gtk3_dep,
pango_dep,
]
@@ -84,6 +83,12 @@ if have_introspection
]
endif
+if have_x11_client
+ mutter_pkg_deps += [
+ gtk3_dep,
+ ]
+endif
+
if have_x11
mutter_pkg_deps += [
xfixes_dep,
@@ -1104,8 +1109,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],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]