diff options
Diffstat (limited to 'mesonbuild/modules/sourceset.py')
-rw-r--r-- | mesonbuild/modules/sourceset.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/modules/sourceset.py b/mesonbuild/modules/sourceset.py index eea3dbd..ba8b300 100644 --- a/mesonbuild/modules/sourceset.py +++ b/mesonbuild/modules/sourceset.py @@ -14,16 +14,13 @@ from collections import namedtuple from .. import mesonlib +from .. import build from ..mesonlib import listify, OrderedSet from . import ExtensionModule, ModuleObject, MutableModuleObject from ..interpreterbase import ( noPosargs, noKwargs, permittedKwargs, InterpreterException, InvalidArguments, InvalidCode, FeatureNew, ) -from ..interpreter import ( - GeneratedListHolder, CustomTargetHolder, - CustomTargetIndexHolder -) SourceSetRule = namedtuple('SourceSetRule', 'keys sources if_false sourcesets dependencies extra_deps') SourceFiles = namedtuple('SourceFiles', 'sources dependencies') @@ -49,8 +46,8 @@ class SourceSet(MutableModuleObject): deps = [] for x in arg: if isinstance(x, (str, mesonlib.File, - GeneratedListHolder, CustomTargetHolder, - CustomTargetIndexHolder)): + build.GeneratedList, build.CustomTarget, + build.CustomTargetIndex)): sources.append(x) elif hasattr(x, 'found'): if not allow_deps: |