Commit d20f7e90 authored by Guido Gunther's avatar Guido Gunther
Browse files

Add support for using glib as a subproject



This allows us to run the tests that have our object manager fixes.
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
parent 38ff0a74
......@@ -7,6 +7,7 @@ vgdump
*~
\#*#
.\#*
/subprojects/glib
/subprojects/libhandy
.vscode/
*.gcov
......
......@@ -94,12 +94,30 @@ configure_file(
gnome = import('gnome')
i18n = import('i18n')
if get_option('g_tests')
glib_ver = '>= 2.69'
else
glib_ver = '>= 2.62'
endif
gcr_dep = dependency('gcr-3', version: '>= 3.7.5')
gio_dep = dependency('gio-2.0', version: '>=2.62')
glib_dep = dependency('glib-2.0',
version: glib_ver,
fallback: ['glib', 'libglib_dep'],
default_options: ['tests=false']
)
gio_dep = dependency('gio-2.0',
version: glib_ver,
fallback: ['glib', 'libgio_dep'],
default_options: ['tests=false']
)
gobject_dep = dependency('gobject-2.0',
version: glib_ver,
fallback: ['glib', 'libgobject_dep'],
default_options: ['tests=false']
)
gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.62')
glib_dep = dependency('glib-2.0', version: '>=2.62')
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26')
gobject_dep = dependency('gobject-2.0', version: '>=2.62')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas')
gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
......
......@@ -17,3 +17,8 @@ option('systemd',
option('compositor',
type: 'string', value: '/usr/bin/phoc',
description: 'Path to the Phoc compositor for use in the launcher script')
# For some tests we need (unreleased) glib >= 2.69
option('g_tests',
type: 'boolean', value: false,
description: 'Whether to build tests that require recent glib')
[wrap-git]
directory=glib
url=https://gitlab.gnome.org/GNOME/glib.git
revision=2.69.0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment