diff options
author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-15 13:40:41 -0400 |
---|---|---|
committer | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-24 18:01:27 -0400 |
commit | ff6b3c7a2d5cecb00ad60397b50e319b73461752 (patch) | |
tree | bee58305649364392fe21c1d14966040a687c5e7 /mesonbuild/backend/ninjabackend.py | |
parent | 263cb6a5f0dcbffdf25e159b3bfa07988838aae9 (diff) | |
download | meson-ff6b3c7a2d5cecb00ad60397b50e319b73461752.zip meson-ff6b3c7a2d5cecb00ad60397b50e319b73461752.tar.gz meson-ff6b3c7a2d5cecb00ad60397b50e319b73461752.tar.bz2 |
vala: Custom header and vapi name (fix #892)
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index fa537ad..6c99fb1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -992,11 +992,11 @@ int dummy; # Library name args += ['--library=' + target.name] # Outputted header - hname = os.path.join(self.get_target_dir(target), target.name + '.h') + hname = os.path.join(self.get_target_dir(target), target.vala_header if isinstance(target.vala_header, str) else (target.name + '.h')) args += ['-H', hname] valac_outputs.append(hname) # Outputted vapi file - base_vapi = target.name + '.vapi' + base_vapi = target.vala_vapi if isinstance(target.vala_vapi, str) else (target.name + '.vapi') vapiname = os.path.join(self.get_target_dir(target), base_vapi) # Force valac to write the vapi file in the target build dir. # Without this, it will write it inside c_out_dir |