Commit aafc0364 authored by Johan Pauwels's avatar Johan Pauwels

Xcode6 py3 fix.

The return type of .keys() in Python 3 is no longer a list, but a 
'dict_keys', which does not support the '+' operator.
parent 716f35db
......@@ -591,7 +591,7 @@ def process_xcode(self):
# The keys represents different build configuration, e.g. Debug, Release and so on..
# Insert our generated build settings to all configuration names
keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys())
keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys())
for k in keys:
if k in settings:
settings[k].update(bldsettings)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment