From 5f5480f33746520f04abaa5d2dec4d613afa3b0c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 14 Jun 2018 13:59:17 +0100 Subject: [PATCH] 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. --- mesonbuild/interpreter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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):