diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-29 00:57:01 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-03 21:46:20 +0200 |
| commit | e1c9d94708fe4b13986fa61aa3fa308f3b6e8a70 (patch) | |
| tree | 6f6e57749addb4f687c6aba3f39a68f35a5c6e34 /mesonbuild/backend/ninjabackend.py | |
| parent | 2f804e9074f391e8efbf4a2deb9f1cc3ebaaaf2e (diff) | |
| download | meson-e1c9d94708fe4b13986fa61aa3fa308f3b6e8a70.zip meson-e1c9d94708fe4b13986fa61aa3fa308f3b6e8a70.tar.gz meson-e1c9d94708fe4b13986fa61aa3fa308f3b6e8a70.tar.bz2 | |
Allow many version conditions for pkg-config deps
Sometimes we want to restrict the acceptable versions to a list of
versions, or a smallest-version + largest-version, or both. For
instance, GStreamer's opencv plugin is only compatible with
3.1.0 >= opencv >= 2.3.0
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index bd65cbe..d0267bc 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1017,9 +1017,11 @@ int dummy; args += valac.get_werror_args() for d in target.get_external_deps(): if isinstance(d, dependencies.PkgConfigDependency): - if d.name == 'glib-2.0' and d.version_requirement is not None \ - and d.version_requirement.startswith(('>=', '==')): - args += ['--target-glib', d.version_requirement[2:]] + if d.name == 'glib-2.0' and d.version_reqs is not None: + for req in d.version_reqs: + if req.startswith(('>=', '==')): + args += ['--target-glib', req[2:]] + break args += ['--pkg', d.name] elif isinstance(d, dependencies.ExternalLibrary): args += d.get_lang_args('vala') |