Use array context for include/library paths in gyp config

Remove -I prefix from include paths
Should allow for compilation on FreeBSD #326
This commit is contained in:
Lovell Fuller 2016-01-01 14:04:32 +00:00
parent 6d62051877
commit dc2b79ac9a

View File

@ -49,12 +49,12 @@
'conditions': [ 'conditions': [
['use_global_vips == "true"', { ['use_global_vips == "true"', {
# Use pkg-config for include and lib # Use pkg-config for include and lib
'include_dirs': ['<!(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --cflags vips glib-2.0)'], 'include_dirs': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --cflags-only-I vips glib-2.0 | sed s\/-I//g)'],
'conditions': [ 'conditions': [
['runtime_link == "static"', { ['runtime_link == "static"', {
'libraries': ['<!(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips --static)'] 'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs --static vips)']
}, { }, {
'libraries': ['<!(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips)'] 'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips)']
}] }]
] ]
}, { }, {