one last workaround for now to fix potential gdal -framework configuration problem
This commit is contained in:
parent
40047e7a56
commit
4720303507
1 changed files with 2 additions and 1 deletions
|
@ -530,6 +530,8 @@ def parse_config(context, config, checks='--libs --cflags'):
|
|||
if not num_libs > env['LIBS']:
|
||||
env['LIBS'].append('gdal')
|
||||
env['LIBPATH'].insert(0,'/Library/Frameworks/GDAL.framework/unix/lib')
|
||||
if 'GDAL' in env.get('FRAMEWORKS',[]):
|
||||
env["FRAMEWORKS"].remove("GDAL")
|
||||
else:
|
||||
env.ParseConfig(cmd)
|
||||
parsed = True
|
||||
|
@ -1377,7 +1379,6 @@ if not HELP_REQUESTED and '-c' not in command_line_args:
|
|||
else:
|
||||
color_print(1,"Notice: depedencies not met for plugin '%s', not building..." % plugin)
|
||||
|
||||
|
||||
# todo - generalize this path construction, also used in plugin SConscript...
|
||||
plugin_dir = os.path.normpath(env['DESTDIR'] + '/' + env['PREFIX'] + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'])
|
||||
create_uninstall_target(env, plugin_dir, False)
|
||||
|
|
Loading…
Reference in a new issue