From 940ebd658b9e7bf1679bd8fbfbcb6b429d80424a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 26 Jul 2019 16:04:41 +0400 Subject: [PATCH] sourceset: fix using FeatureCheck decorators The feature check facilities need to have access to subproject. --- mesonbuild/modules/sourceset.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mesonbuild/modules/sourceset.py b/mesonbuild/modules/sourceset.py index ca913f62a..fc46a7ad6 100644 --- a/mesonbuild/modules/sourceset.py +++ b/mesonbuild/modules/sourceset.py @@ -30,11 +30,12 @@ SourceSetRule = namedtuple('SourceSetRule', 'keys sources if_false sourcesets de SourceFiles = namedtuple('SourceFiles', 'sources dependencies') class SourceSetHolder(MutableInterpreterObject, ObjectHolder): - def __init__(self, environment, subdir): + def __init__(self, interpreter): MutableInterpreterObject.__init__(self) ObjectHolder.__init__(self, list()) - self.environment = environment - self.subdir = subdir + self.subproject = interpreter.subproject + self.environment = interpreter.environment + self.subdir = interpreter.subdir self.frozen = False self.methods.update({ 'add': self.add_method, @@ -184,7 +185,7 @@ class SourceSetModule(ExtensionModule): @noKwargs @noPosargs def source_set(self, interpreter, state, args, kwargs): - return SourceSetHolder(interpreter.environment, interpreter.subdir) + return SourceSetHolder(interpreter) def initialize(*args, **kwargs): return SourceSetModule(*args, **kwargs)