diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-27 04:13:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 04:13:25 -0400 |
| commit | 4a4322064ea38666cebe8479bebe81e33ab23439 (patch) | |
| tree | 10d1ed23af3911bb337bb2ec172e0ff619757f4f | |
| parent | e630d899daf34cea5dcb74182861824904fbab10 (diff) | |
| parent | 03ba7cd8433975a4c6bce56aba754825bd61627f (diff) | |
| download | meson-4a4322064ea38666cebe8479bebe81e33ab23439.zip meson-4a4322064ea38666cebe8479bebe81e33ab23439.tar.gz meson-4a4322064ea38666cebe8479bebe81e33ab23439.tar.bz2 | |
Merge pull request #1986 from phako/master
Skip handling non-available dependencies
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 | ||||
| -rw-r--r-- | test cases/vala/3 dep/meson.build | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 1dd128b..95b0026 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -429,6 +429,9 @@ class Backend: # NOTE: We must preserve the order in which external deps are # specified, so we reverse the list before iterating over it. for dep in reversed(target.get_external_deps()): + if not dep.found(): + continue + if compiler.language == 'vala': if isinstance(dep, dependencies.PkgConfigDependency): if dep.name == 'glib-2.0' and dep.version_reqs is not None: diff --git a/test cases/vala/3 dep/meson.build b/test cases/vala/3 dep/meson.build index d327fb5..c3563b1 100644 --- a/test cases/vala/3 dep/meson.build +++ b/test cases/vala/3 dep/meson.build @@ -2,7 +2,10 @@ project('giotest', 'vala', 'c') glib = dependency('glib-2.0') gobject = dependency('gobject-2.0') -gio = dependency('gio-2.0') +gio = [dependency('gio-2.0'), + # https://github.com/mesonbuild/meson/issues/1484 + dependency('gio-unix-2.0', required : false), + dependency('gio-windows-2.0', required : false)] e = executable('gioprog', 'gioprog.vala', dependencies : [glib, gobject, gio]) |