aboutsummaryrefslogtreecommitdiff
path: root/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-02-09 21:47:36 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-02-09 21:47:36 +0200
commitd84d70fa9a490578ffa926be82edefeeed217cb7 (patch)
treebc360ecd02ba47f282590aef952564518930f81f /interpreter.py
parent161f2a6a30a76a3aef6e6ee20268e0e8adac5d11 (diff)
downloadmeson-d84d70fa9a490578ffa926be82edefeeed217cb7.zip
meson-d84d70fa9a490578ffa926be82edefeeed217cb7.tar.gz
meson-d84d70fa9a490578ffa926be82edefeeed217cb7.tar.bz2
Specify subdirs explicitly.
Diffstat (limited to 'interpreter.py')
-rw-r--r--interpreter.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/interpreter.py b/interpreter.py
index 7620ae7..9f84816 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -744,12 +744,12 @@ class Interpreter():
for l in libs:
if not (isinstance(l, SharedLibraryHolder) or isinstance(l, StaticLibraryHolder)):
raise InterpreterException('Library argument not a library object.')
- headers = kwargs.get('headers', [])
- if not isinstance(headers, list):
- headers = [headers]
- for h in headers:
- if not isinstance(h, Headers):
- raise InterpreterException('Header argument not a Headers object.')
+ subdirs = kwargs.get('subdirs', ['.'])
+ if not isinstance(subdirs, list):
+ subdirs = [subdirs]
+ for h in subdirs:
+ if not isinstance(h, str):
+ raise InterpreterException('Header argument not string.')
version = kwargs.get('version', '')
if not isinstance(version, str):
raise InterpreterException('Version must be a string.')
@@ -762,7 +762,7 @@ class Interpreter():
description = kwargs.get('description', None)
if not isinstance(description, str):
raise InterpreterException('Description is not a string.')
- p = build.PkgConfigGenerator(libs, headers, name, description, version, filebase)
+ p = build.PkgConfigGenerator(libs, subdirs, name, description, version, filebase)
self.build.pkgconfig_gens.append(p)
def func_is_subproject(self, nodes, args, kwargs):