diff options
| author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2017-09-15 10:24:59 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-18 20:40:53 +0300 |
| commit | 02ad00b9826a037d87477af46dde07bfa26d0089 (patch) | |
| tree | 30f99949f6125a02ae6638a08aadcd2ae53ac7c8 | |
| parent | 076f3c53bd4d959448507eb904ed9d5890a6f121 (diff) | |
| download | meson-02ad00b9826a037d87477af46dde07bfa26d0089.zip meson-02ad00b9826a037d87477af46dde07bfa26d0089.tar.gz meson-02ad00b9826a037d87477af46dde07bfa26d0089.tar.bz2 | |
ninja: Fix the dependency on the VAPI when 'vala_vapi' is used
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | test cases/vala/12 custom output/bar.vala | 0 | ||||
| -rw-r--r-- | test cases/vala/12 custom output/meson.build | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cd92972..7088c1e 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1048,7 +1048,7 @@ int dummy; if hasattr(i, 'fname'): i = i.fname if i.endswith('vala'): - vapiname = dep.name + '.vapi' + vapiname = dep.vala_vapi fullname = os.path.join(self.get_target_dir(dep), vapiname) result.add(fullname) break diff --git a/test cases/vala/12 custom output/bar.vala b/test cases/vala/12 custom output/bar.vala new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/vala/12 custom output/bar.vala diff --git a/test cases/vala/12 custom output/meson.build b/test cases/vala/12 custom output/meson.build index ef6dbb5..c328959 100644 --- a/test cases/vala/12 custom output/meson.build +++ b/test cases/vala/12 custom output/meson.build @@ -3,7 +3,11 @@ project('valatest', 'c', 'vala') glib = dependency('glib-2.0') gobject = dependency('gobject-2.0') -library('foo-1.0', 'foo.vala', - vala_header: 'foo.h', - vala_vapi: 'foo.vapi', +foo_lib = library('foo-1.0', 'foo.vala', + vala_header: 'foo.h', + vala_vapi: 'foo.vapi', + dependencies: [glib, gobject]) + +library('bar', 'bar.vala', + link_with: [foo_lib], dependencies: [glib, gobject]) |