sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better workaround for unsupported GDAL framework linking on osx

Browse source
This commit is contained in:
Dane Springmeyer 2011-02-23 21:24:23 +00:00
parent 9d351be091
commit 3b295143bc
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -521,14 +521,17 @@ def parse_config(context, config, checks='--libs --cflags'):
parsed = False parsed = False
if ret: if ret:
try: try:
if 'gdal-config' in cmd:
env.ParseConfig(cmd)
# hack for potential -framework GDAL syntax # hack for potential -framework GDAL syntax
# which will not end up being added to env['LIBS'] # which will not end up being added to env['LIBS']
# and thus breaks knowledge below that gdal worked # and thus breaks knowledge below that gdal worked
if 'gdal-config' in cmd: # TODO - upgrade our scons logic to support Framework linking
num_libs = len(env['LIBS']) if env['PLATFORM'] == 'Darwin':
env.ParseConfig(cmd) value = call(cmd,silent=True)
if not num_libs > env['LIBS']: if value and '-framework GDAL' in value:
env['LIBS'].append('gdal') env['LIBS'].append('gdal')
if os.path.exists('/Library/Frameworks/GDAL.framework/unix/lib'):
env['LIBPATH'].insert(0,'/Library/Frameworks/GDAL.framework/unix/lib') env['LIBPATH'].insert(0,'/Library/Frameworks/GDAL.framework/unix/lib')
if 'GDAL' in env.get('FRAMEWORKS',[]): if 'GDAL' in env.get('FRAMEWORKS',[]):
env["FRAMEWORKS"].remove("GDAL") env["FRAMEWORKS"].remove("GDAL")