diff options
| author | James Westman <james@jwestman.net> | 2025-05-26 19:37:56 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-05-31 00:59:08 +0300 |
| commit | 9daf73008f7b97858dbd34f38a577b531e412570 (patch) | |
| tree | f7d873150f38519f14ece680878cc016df3cfe2b | |
| parent | 7c2f22feefe2d8014138b02a2119026a01f52dea (diff) | |
| download | meson-9daf73008f7b97858dbd34f38a577b531e412570.tar.gz | |
Vala: Fix GResource source directories
The code that adds `--gresourcesdir=` arguments to valac based on the
source directories of GResource dependencies was incorrect. It added
the current target directory to the source path, but the GResource
source directories are already relative to the build directory.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9d83d8651..3f8deaf81 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1776,7 +1776,7 @@ class NinjaBackend(backends.Backend): gres_xml, = self.get_custom_target_sources(gensrc) args += ['--gresources=' + gres_xml] for source_dir in gensrc.source_dirs: - gres_dirs += [os.path.join(self.get_target_dir(gensrc), source_dir)] + gres_dirs += [source_dir] # Ensure that resources are built before vala sources # This is required since vala code using [GtkTemplate] effectively depends on .ui files # GResourceHeaderTarget is not suitable due to lacking depfile |