From 8f41154827d9608234d0c0455551392d968d9e23 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 19 Nov 2016 01:14:05 +0200 Subject: Can specify headers to install with Files. --- mesonbuild/interpreter.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1c562b6..b20d98c 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -457,10 +457,9 @@ class IncludeDirsHolder(InterpreterObject): class Headers(InterpreterObject): - def __init__(self, src_subdir, sources, kwargs): + def __init__(self, sources, kwargs): InterpreterObject.__init__(self) self.sources = sources - self.source_subdir = src_subdir self.install_subdir = kwargs.get('subdir', '') self.custom_install_dir = kwargs.get('install_dir', None) if self.custom_install_dir is not None: @@ -473,9 +472,6 @@ class Headers(InterpreterObject): def get_install_subdir(self): return self.install_subdir - def get_source_subdir(self): - return self.source_subdir - def get_sources(self): return self.sources @@ -2155,9 +2151,9 @@ requirements use the version keyword argument instead.''') self.build.benchmarks.append(t) mlog.debug('Adding benchmark "', mlog.bold(args[0]), '".', sep='') - @stringArgs def func_install_headers(self, node, args, kwargs): - h = Headers(self.subdir, args, kwargs) + source_files = self.source_strings_to_files(args) + h = Headers(source_files, kwargs) self.build.headers.append(h) return h -- cgit v1.1