summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@collabora.com>2018-12-18 14:11:04 +0100
committerOlivier CrĂȘte <olivier.crete@ocrete.ca>2018-12-21 19:51:15 +0000
commitff75be1b19fc2599fda520321649da32625c561d (patch)
tree7d952b5546efe15c535c3f698557c6deaa3bc57e
parent172727599005c8c0ded5754a6916e901b7ef452e (diff)
downloadlibnice-ff75be1b19fc2599fda520321649da32625c561d.tar.gz
meson: Fix pkg-config generation with internal dependencies
Prevents Meson error: ERROR: requires argument not a string, library with pkgconfig-generated file or pkgconfig-dependency object, got <InternalDependency null: True> Requires Meson 0.49.
-rw-r--r--meson.build2
-rw-r--r--nice/meson.build4
2 files changed, 2 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 39afcfa..7348723 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('libnice', 'c',
version: '0.1.14.1',
- meson_version : '>= 0.47.0',
+ meson_version : '>= 0.49.0',
default_options : ['warning_level=1', 'buildtype=debugoptimized'])
nice_version = meson.project_version()
diff --git a/nice/meson.build b/nice/meson.build
index 01a6da0..15dc250 100644
--- a/nice/meson.build
+++ b/nice/meson.build
@@ -62,7 +62,5 @@ pkg.generate(libnice,
filebase: 'nice',
subdirs: 'nice',
description: 'ICE library',
- requires: gio_dep,
- requires_private: [gthread_dep, gupnp_igd_dep, crypto_dep],
- libraries_private: syslibs,
+ libraries: gio_dep,
variables: ['upnp_enabled=@0@'.format(upnp_enabled_string)])