summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-01-10 06:34:04 +0000
committerDavid Robillard <d@drobilla.net>2011-01-10 06:34:04 +0000
commitca4f88a4744a90faf53a799d126184846cee3bcd (patch)
treefd2ef55ddd70c0a734477829b97ace4557c89314
parentce460962700be73fc538165d8dccd91f59c9e209 (diff)
downloadautowaf-ca4f88a4744a90faf53a799d126184846cee3bcd.tar.gz
autowaf-ca4f88a4744a90faf53a799d126184846cee3bcd.tar.bz2
autowaf-ca4f88a4744a90faf53a799d126184846cee3bcd.zip
Add dependency framework flags when using a local library.
git-svn-id: http://svn.drobilla.net/autowaf@21 e2e4594f-ea7b-45dc-bc5a-5f5301e603aa
-rw-r--r--autowaf.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/autowaf.py b/autowaf.py
index 1c3cdc9..e198973 100644
--- a/autowaf.py
+++ b/autowaf.py
@@ -237,6 +237,12 @@ def set_local_lib(conf, name, has_objects):
conf.env['AUTOWAF_LOCAL_HEADERS'] = {}
conf.env['AUTOWAF_LOCAL_HEADERS'][name.lower()] = True
+def append_property(obj, key, val):
+ if hasattr(obj, key):
+ setattr(obj, key, getattr(obj, key) + val)
+ else:
+ setattr(obj, key, val)
+
def use_lib(bld, obj, libs):
abssrcdir = os.path.abspath('.')
libs_list = libs.split()
@@ -244,21 +250,15 @@ def use_lib(bld, obj, libs):
in_headers = l.lower() in bld.env['AUTOWAF_LOCAL_HEADERS']
in_libs = l.lower() in bld.env['AUTOWAF_LOCAL_LIBS']
if in_libs:
- if hasattr(obj, 'use'):
- obj.use += ' lib' + l.lower() + ' '
- else:
- obj.use = 'lib' + l.lower() + ' '
-
+ append_property(obj, 'use', ' lib%s ' % l.lower())
+ append_property(obj, 'framework', bld.env['FRAMEWORK_' + l])
if in_headers or in_libs:
inc_flag = '-iquote ' + os.path.join(abssrcdir, l.lower())
for f in ['CFLAGS', 'CXXFLAGS']:
if not inc_flag in bld.env[f]:
bld.env.append_value(f, inc_flag)
else:
- if hasattr(obj, 'uselib'):
- obj.uselib += ' ' + l
- else:
- obj.uselib = l
+ append_property(obj, 'uselib', ' ' + l)
def display_header(title):
Logs.pprint('BOLD', title)