From a176588151bd5809ed85929d5513cfd5a8791473 Mon Sep 17 00:00:00 2001 From: Philipp Ittershagen Date: Wed, 25 Oct 2017 19:58:57 +0200 Subject: fix include_directories handling in subprojects for compiler tests. --- mesonbuild/interpreter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 28cb5ad..b90a88c 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -696,7 +696,8 @@ class CompilerHolder(InterpreterObject): if not isinstance(i, IncludeDirsHolder): raise InterpreterException('Include directories argument must be an include_directories object.') for idir in i.held_object.get_incdirs(): - idir = os.path.join(self.environment.get_source_dir(), idir) + idir = os.path.join(self.environment.get_source_dir(), + i.held_object.get_curdir(), idir) args += self.compiler.get_include_args(idir, False) if not nobuiltins: opts = self.environment.coredata.compiler_options -- cgit v1.1