summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-02-13 19:57:46 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-09-15 15:39:08 +0100
commit0a1468f8f3a3f64bf2a02a594c705ebb81c8c1f7 (patch)
tree46ae85c3569194783f2cf74fd89133813f2afed6
parent963107b737daf28ec7e26856bb977bd92ab00033 (diff)
downloadmeson-0a1468f8f3a3f64bf2a02a594c705ebb81c8c1f7.tar.gz
Convert custom target sources to Files with self.source_strings_to_files.
-rw-r--r--mesonbuild/interpreter.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 0e6a041ce..76e443975 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3231,6 +3231,8 @@ root and issuing %s.
'Implementation-only, without FeatureNew checks, for internal use'
name = args[0]
kwargs['install_mode'] = self._get_kwarg_install_mode(kwargs)
+ if 'input' in kwargs:
+ kwargs['input'] = self.source_strings_to_files(extract_as_list(kwargs, 'input'))
tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs), self)
self.add_target(name, tg.held_object)
return tg
@@ -3908,7 +3910,7 @@ Try setting b_lundef to false instead.'''.format(self.coredata.base_options['b_s
sources = [sources]
for s in sources:
if isinstance(s, (mesonlib.File, GeneratedListHolder,
- CustomTargetHolder, CustomTargetIndexHolder)):
+ TargetHolder, CustomTargetIndexHolder)):
pass
elif isinstance(s, str):
self.validate_within_subproject(self.subdir, s)