diff options
| author | TingPing <tingping@tingping.se> | 2018-07-11 15:38:35 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-10 19:42:20 +0300 |
| commit | 08216a3a8691cc1e5eaaa8f862f3278f98cad94c (patch) | |
| tree | 415489fe93fb83e6f54cb0dce530af67a6a1c1a2 /mesonbuild/modules | |
| parent | 25fef3d1facecfb64108ef0a1439d24100593935 (diff) | |
| download | meson-08216a3a8691cc1e5eaaa8f862f3278f98cad94c.zip meson-08216a3a8691cc1e5eaaa8f862f3278f98cad94c.tar.gz meson-08216a3a8691cc1e5eaaa8f862f3278f98cad94c.tar.bz2 | |
gnome.compile_resources: Put dependency directories before current source dir
This avoids the problem of generated files with the same name as something in source
existing and using the wrong file.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0d1c22f..46df53e 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -154,10 +154,10 @@ class GnomeModule(ExtensionModule): # Make source dirs relative to build dir now source_dirs = [os.path.join(state.build_to_src, state.subdir, d) for d in source_dirs] - # Always include current directory, but after paths set by user - source_dirs.append(os.path.join(state.build_to_src, state.subdir)) # Ensure build directories of generated deps are included source_dirs += subdirs + # Always include current directory, but after paths set by user + source_dirs.append(os.path.join(state.build_to_src, state.subdir)) for source_dir in OrderedSet(source_dirs): cmd += ['--sourcedir', source_dir] |