diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2016-09-23 12:30:44 -0300 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2016-09-26 15:25:59 -0300 |
| commit | 52a4b3302e17654ef18a2e439ca9e6353f323254 (patch) | |
| tree | 463adca5f1833e12ba04d09906c0bc643673707b | |
| parent | 8ab62a27b466005db00c8fb3e96c5f2dca71dfbe (diff) | |
| download | meson-52a4b3302e17654ef18a2e439ca9e6353f323254.zip meson-52a4b3302e17654ef18a2e439ca9e6353f323254.tar.gz meson-52a4b3302e17654ef18a2e439ca9e6353f323254.tar.bz2 | |
gnome: Make all include paths absolute
The relative computation was broken when using
subprojects.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 4f72d2f..7d15578 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -107,8 +107,6 @@ class GnomeModule: if not include_dirs: return [] - build_to_src = os.path.relpath(state.environment.get_source_dir(), - state.environment.get_build_dir()) dirs_str = [] for incdirs in include_dirs: if hasattr(incdirs, "held_object"): @@ -124,8 +122,9 @@ class GnomeModule: basedir = dirs.get_curdir() for d in dirs.get_incdirs(): expdir = os.path.join(basedir, d) - srctreedir = os.path.join(build_to_src, expdir) - dirs_str += ['%s%s' % (prefix, expdir), + srctreedir = os.path.join(state.environment.get_source_dir(), expdir) + buildtreedir = os.path.join(state.environment.get_build_dir(), expdir) + dirs_str += ['%s%s' % (prefix, buildtreedir), '%s%s' % (prefix, srctreedir)] for d in dirs.get_extra_build_dirs(): dirs_str += ['%s%s' % (prefix, d)] |