summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-06-14 13:59:17 +0100
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-18 10:52:21 +0000
commit5f5480f33746520f04abaa5d2dec4d613afa3b0c (patch)
tree3f20ba03962f6be630e74ac7b8044d2c39a2af8e
parentd17ce4ffd0b36192aa728bebbf0f29661f472b62 (diff)
downloadmeson-5f5480f33746520f04abaa5d2dec4d613afa3b0c.tar.gz
Make a custom target output dir as an include dir relative to @BUILD_ROOT@
Make a custom target output dir as an include dir relative to @BUILD_ROOT@, so that path is constructed correctly when using the absolute path forms used by the MSVC backend.
-rw-r--r--mesonbuild/interpreter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 3072b8b4b..b815f06f5 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -856,7 +856,7 @@ class CustomTargetHolder(TargetHolder):
def outdir_include(self):
return IncludeDirsHolder(build.IncludeDirs('', [], False,
- [self.interpreter.backend.get_target_dir(self.held_object)]))
+ [os.path.join('@BUILD_ROOT@', self.interpreter.backend.get_target_dir(self.held_object))]))
class RunTargetHolder(InterpreterObject, ObjectHolder):
def __init__(self, name, command, args, dependencies, subdir, subproject):