[gnome-builder] build: include webkit in deps dynamically based on build config
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: include webkit in deps dynamically based on build config
- Date: Fri, 16 Sep 2022 23:02:21 +0000 (UTC)
commit 95df8fbbb70986ed24da8e04934b8dc0af894b88
Author: Christian Hergert <chergert redhat com>
Date: Fri Sep 16 16:01:48 2022 -0700
build: include webkit in deps dynamically based on build config
src/libide/webkit/meson.build | 3 +++
src/meson.build | 25 +++++++++++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/webkit/meson.build b/src/libide/webkit/meson.build
index 43011c64a..a2077d538 100644
--- a/src/libide/webkit/meson.build
+++ b/src/libide/webkit/meson.build
@@ -55,6 +55,9 @@ libide_webkit_deps = [
libide_gui_dep,
]
+gnome_builder_pkg_requires += ['webkit2gtk-5.0']
+gnome_builder_gir_includes += ['WebKit2-5.0']
+
#
# Library Definitions
#
diff --git a/src/meson.build b/src/meson.build
index ce66a21e4..5ce2e4dd4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -50,6 +50,27 @@ test_cflags = [
'-I' + join_paths(meson.project_source_root(), 'src'),
]
+gnome_builder_pkg_requires = [
+ 'gio-2.0',
+ 'gio-unix-2.0',
+ 'gtk4',
+ 'vte-2.91-gtk4',
+ 'gtksourceview-5',
+ 'template-glib-1.0',
+ 'libpeas-1.0',
+]
+
+gnome_builder_gir_includes = [
+ 'Gio-2.0',
+ 'Gtk-4.0',
+ 'Peas-1.0',
+ 'Vte-3.91',
+ 'GtkSource-5',
+ 'Adw-1',
+ 'Panel-1',
+ 'Template-1.0',
+]
+
subdir('libide')
subdir('plugins')
@@ -129,7 +150,7 @@ pkgconfig.generate(
filebase: 'gnome-builder-@0@.@1@'.format(MAJOR_VERSION, MINOR_VERSION),
description: 'Contains the plugin container for Builder.',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
- requires: [ 'gio-2.0', 'gio-unix-2.0', 'gtk4', 'vte-2.91-gtk4', 'gtksourceview-5', 'template-glib-1.0',
'libpeas-1.0' ],
+ requires: gnome_builder_pkg_requires,
)
libide_gir = gnome.generate_gir(gnome_builder,
@@ -141,7 +162,7 @@ libide_gir = gnome.generate_gir(gnome_builder,
namespace: 'Ide',
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
- includes: [ 'Gio-2.0', 'Gtk-4.0', 'Peas-1.0', 'Vte-3.91', 'GtkSource-5', 'Adw-1', 'Panel-1',
'Template-1.0' ],
+ includes: gnome_builder_gir_includes,
install: true,
install_dir_gir: pkggirdir,
install_dir_typelib: pkgtypelibdir,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]