diff options
| author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-07 10:28:07 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 18:03:24 -0500 |
| commit | b2a39dd06ee139152d5522c961e6ba04acdec791 (patch) | |
| tree | 82d6f16f33f9aeb5211051909615de436158c788 /mesonbuild/backend/ninjabackend.py | |
| parent | 59a414283c5caf006745aefff44489e689223050 (diff) | |
| download | meson-b2a39dd06ee139152d5522c961e6ba04acdec791.zip meson-b2a39dd06ee139152d5522c961e6ba04acdec791.tar.gz meson-b2a39dd06ee139152d5522c961e6ba04acdec791.tar.bz2 | |
vala: Generate GIR into the build directory (fix #185)
Add a Vala test generating GIR and typelib files.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index fb1280b..fa4d5cf 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1034,10 +1034,14 @@ int dummy; valac_outputs.append(hname) # Outputted vapi file vapiname = os.path.join(self.get_target_dir(target), target.vala_vapi) - # Force valac to write the vapi file in the target build dir. + # Force valac to write the vapi and gir files in the target build dir. # Without this, it will write it inside c_out_dir args += ['--vapi', os.path.join('..', target.vala_vapi)] valac_outputs.append(vapiname) + if isinstance(target.vala_gir, str): + girname = os.path.join(self.get_target_dir(target), target.vala_gir) + args += ['--gir', os.path.join('..', target.vala_gir)] + valac_outputs.append(girname) if self.environment.coredata.get_builtin_option('werror'): args += valac.get_werror_args() for d in target.get_external_deps(): |