summaryrefslogtreecommitdiff
path: root/random
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@collabora.com>2018-12-17 13:03:24 +0100
committerOlivier CrĂȘte <olivier.crete@ocrete.ca>2018-12-21 19:51:15 +0000
commit172727599005c8c0ded5754a6916e901b7ef452e (patch)
tree7361c0d5f85233b863a4c2ec60906238455d971a /random
parent9864f36b6436e29f8eff28644c952c4c8f066272 (diff)
downloadlibnice-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 'random')
-rw-r--r--random/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/random/meson.build b/random/meson.build
index 14eaaff..e3c3fa3 100644
--- a/random/meson.build
+++ b/random/meson.build
@@ -2,13 +2,13 @@ librandom = static_library('nice-random',
'random.c', 'random-glib.c',
c_args: ['-DG_LOG_DOMAIN="libnice-random"'],
include_directories: nice_incs,
- dependencies: [glib_dep, gthread_dep],
+ dependencies: gio_deps + [gthread_dep],
install: false)
if not get_option('tests').disabled()
test_exe = executable('nice-random-test', 'test.c',
include_directories: nice_incs,
- dependencies: [glib_dep, gthread_dep],
+ dependencies: gio_deps + [gthread_dep],
link_with: librandom)
test('nice-random', test_exe)