From 082ebcf6150a2551f1c6c531f4c4422529b2280f Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 11 Feb 2015 15:10:07 +0100
Subject: [PATCH] Use pkg-config after own search to be able to use our
externals.
---
setup.py | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/setup.py b/setup.py
index d7708a4..6fb3362 100644
--- a/setup.py
+++ b/setup.py
@@ -50,18 +50,10 @@ class hdf5:
import os
self.name = 'hdf5'
-
- # try to use pkg_config first
- try:
- pkg = pkgconfig('hdf5')
- self.include_directories = pkg.include_directories()
- version_header = os.path.join(self.include_directories[0], 'H5pubconf.h')
- self.version = libhdf5_version(version_header)
- self.libraries = pkg.libraries()
- self.library_directories = pkg.library_directories()
- except RuntimeError:
-
- # locate pkg-config on our own
+
+ # try to locate pkg-config on our own first
+ try:
+
header = 'hdf5.h'
candidates = find_header(header)
@@ -124,6 +116,16 @@ class hdf5:
# library path
self.library_directories = [os.path.dirname(candidates[0])]
+ except RuntimeError:
+ # now, we try to use pkg-config, which seems to be only available on Debian
+ pkg = pkgconfig('hdf5')
+ self.include_directories = pkg.include_directories()
+ version_header = os.path.join(self.include_directories[0], 'H5pubconf.h')
+ self.version = libhdf5_version(version_header)
+ self.libraries = pkg.libraries()
+ self.library_directories = pkg.library_directories()
+
+
def macros(self):
return [
('HAVE_%s' % self.name.upper(), '1'),
--
GitLab