Skip to content

Commit c8c4a6d

Browse files
committed
Merge pull request brianc#334 from aleyush/check_pg_config
Check pg_config existance
2 parents d51994c + 552a844 commit c8c4a6d

File tree

1 file changed

+25
-14
lines changed

1 file changed

+25
-14
lines changed

binding.gyp

+25-14
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,34 @@
22
'targets': [
33
{
44
'target_name': 'binding',
5-
'sources': [
6-
'src/binding.cc'
7-
],
85
'conditions' : [
96
['OS=="win"', {
10-
'include_dirs': ['<!@(pg_config --includedir)'],
11-
'libraries' : ['libpq.lib'],
12-
'msvs_settings': {
13-
'VCLinkerTool' : {
14-
'AdditionalLibraryDirectories' : [
15-
'<!@(pg_config --libdir)\\'
16-
]
17-
},
18-
}
7+
'conditions' : [
8+
['"<!@(cmd /C where /Q pg_config || echo n)"!="n"',
9+
{
10+
'sources': ['src/binding.cc'],
11+
'include_dirs': ['<!@(pg_config --includedir)'],
12+
'libraries' : ['libpq.lib'],
13+
'msvs_settings': {
14+
'VCLinkerTool' : {
15+
'AdditionalLibraryDirectories' : [
16+
'<!@(pg_config --libdir)\\'
17+
]
18+
},
19+
}
20+
}
21+
]
22+
]
1923
}, { # OS!="win"
20-
'include_dirs': ['<!@(pg_config --includedir)'],
21-
'libraries' : ['-lpq -L<!@(pg_config --libdir)']
24+
'conditions' : [
25+
['"y"!="n"', # ToDo: add pg_config existance condition that works on linux
26+
{
27+
'sources': ['src/binding.cc'],
28+
'include_dirs': ['<!@(pg_config --includedir)'],
29+
'libraries' : ['-lpq -L<!@(pg_config --libdir)']
30+
}
31+
]
32+
]
2233
}]
2334
]
2435
}

0 commit comments

Comments
 (0)