diff options
| author | Jakub Adam <jakub.adam@collabora.com> | 2018-12-17 13:03:24 +0100 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@ocrete.ca> | 2018-12-21 19:51:15 +0000 |
| commit | 172727599005c8c0ded5754a6916e901b7ef452e (patch) | |
| tree | 7361c0d5f85233b863a4c2ec60906238455d971a /meson.build | |
| parent | 9864f36b6436e29f8eff28644c952c4c8f066272 (diff) | |
| download | libnice-172727599005c8c0ded5754a6916e901b7ef452e.tar.gz | |
meson: Fix build with fallback glib
When building libnice with glib fallback, its 'libgio_dep' internal
dependency doesn't provide all needed include and library search paths.
To avoid unresolved header files and linker errors in such case,
'libglib_dep', 'libmodule_dep' and 'libgobject_dep' from glib submodule
must be pulled in as well.
The problem should be fixed in GLib 2.60.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 70c5b50..39afcfa 100644 --- a/meson.build +++ b/meson.build @@ -163,8 +163,18 @@ foreach w : warnings endforeach # Dependencies -glib_dep = dependency('gio-2.0', version: glib_req, +gio_dep = dependency('gio-2.0', version: glib_req, fallback: ['glib', 'libgio_dep']) +gio_deps = [gio_dep] +if gio_dep.type_name() == 'internal' + # A workaround for libgio_dep not having its dependencies correctly declared. + # Should be fixed in GLib 2.60. + gio_deps += [ + dependency('', fallback: ['glib', 'libglib_dep']), + dependency('', fallback: ['glib', 'libgmodule_dep']), + dependency('', fallback: ['glib', 'libgobject_dep']) + ] +endif gthread_dep = dependency('gthread-2.0', fallback: ['glib', 'libgthread_dep']) @@ -212,7 +222,7 @@ libm = cc.find_library('m', required: false) nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun') -nice_deps = [glib_dep, gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs +nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs ignored_iface_prefix = get_option('ignored-network-interface-prefix') if ignored_iface_prefix != '' |