diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-03-13 01:38:37 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-13 19:20:40 +0200 |
| commit | 552916d2d24723ef579ee54b18b8bd7b25328cf8 (patch) | |
| tree | db31e1f7eb98c1bd517aea1fba63829fc4901d66 /mesonbuild/modules/pkgconfig.py | |
| parent | 6e83e41af710df28c4452fa41b0223390f6c37c5 (diff) | |
| download | meson-552916d2d24723ef579ee54b18b8bd7b25328cf8.zip meson-552916d2d24723ef579ee54b18b8bd7b25328cf8.tar.gz meson-552916d2d24723ef579ee54b18b8bd7b25328cf8.tar.bz2 | |
pkgconfig: allow any non-found dependency requires arguments
On some platforms such as OSX external dependency falls back
to different dependency types if it is not found.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 881688e..074fc5a 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -63,6 +63,8 @@ class DependenciesHelper: processed_reqs.append(obj.name) elif isinstance(obj, str): processed_reqs.append(obj) + elif isinstance(obj, dependencies.Dependency) and not obj.found(): + pass else: raise mesonlib.MesonException('requires argument not a string, ' 'library with pkgconfig-generated file ' |