diff --git a/aksetup_helper.py b/aksetup_helper.py index 12d888c984c1f931aa26353cab0e9b68ce4bb3a0..a895c88baeeb34ae6a33c404ded9c8d8a4b85634 100644 --- a/aksetup_helper.py +++ b/aksetup_helper.py @@ -47,8 +47,11 @@ class NumpyExtension(Extension): from os.path import join return join(pathname, "core", "include") + def get_additional_include_dirs(self): + return [self.get_numpy_incpath()] + def get_include_dirs(self): - return self._include_dirs + [self.get_numpy_incpath()] + return self._include_dirs + self.get_additional_include_dirs() def set_include_dirs(self, value): self._include_dirs = value @@ -64,12 +67,9 @@ class PyUblasExtension(NumpyExtension): from pkg_resources import Requirement, resource_filename return resource_filename(Requirement.parse(name), "%s/include" % name) - @property - def include_dirs(self): - return self._include_dirs + [ - self.get_numpy_incpath(), - self.get_module_include_path("pyublas"), - ] + def get_additional_include_dirs(self): + return (super(PyUblasExtension, self).get_additional_include_dirs() + + [self.get_module_include_path("pyublas")]) class HedgeExtension(PyUblasExtension):