diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-06 22:47:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 22:47:25 +0200 |
| commit | a34ac74cf918a7251d44c2f646972106da1a7f25 (patch) | |
| tree | 479a07f584c119a5931b197546b10ffce88f329d /mesonbuild/compilers/vala.py | |
| parent | 735e138382c2876c181edd09e6bf9bb76225be6d (diff) | |
| parent | 52071c6d4ee15c750f8a8620e038b78627db890e (diff) | |
| download | meson-a34ac74cf918a7251d44c2f646972106da1a7f25.zip meson-a34ac74cf918a7251d44c2f646972106da1a7f25.tar.gz meson-a34ac74cf918a7251d44c2f646972106da1a7f25.tar.bz2 | |
Merge pull request #4547 from mensinda/introIncDirs
mintro: Save introspection to disk and --targets modifications
Diffstat (limited to 'mesonbuild/compilers/vala.py')
| -rw-r--r-- | mesonbuild/compilers/vala.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py index 46bb210..e64d57f 100644 --- a/mesonbuild/compilers/vala.py +++ b/mesonbuild/compilers/vala.py @@ -66,6 +66,19 @@ class ValaCompiler(Compiler): return ['--color=' + colortype] return [] + def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): + for idx, i in enumerate(parameter_list): + if i[:9] == '--girdir=': + parameter_list[idx] = i[:9] + os.path.normpath(os.path.join(build_dir, i[9:])) + if i[:10] == '--vapidir=': + parameter_list[idx] = i[:10] + os.path.normpath(os.path.join(build_dir, i[10:])) + if i[:13] == '--includedir=': + parameter_list[idx] = i[:13] + os.path.normpath(os.path.join(build_dir, i[13:])) + if i[:14] == '--metadatadir=': + parameter_list[idx] = i[:14] + os.path.normpath(os.path.join(build_dir, i[14:])) + + return parameter_list + def sanity_check(self, work_dir, environment): code = 'class MesonSanityCheck : Object { }' args = self.get_cross_extra_flags(environment, link=False) |