diff options
author | David Cournapeau <cournape@gmail.com> | 2009-02-18 17:26:30 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2009-02-18 17:26:30 +0000 |
commit | aa2d15c3f19401523f2794aa526ebe199a78bbab (patch) | |
tree | 064eab9aeb85cbc3204c97e6ee085f0463bb53ab /numpy/distutils/command/build_clib.py | |
parent | e88a1b2baafc4a0df4d01197aef3dfbf815f1d2c (diff) | |
download | numpy-aa2d15c3f19401523f2794aa526ebe199a78bbab.tar.gz |
Add numpy_include_dirs to C libraries as well.
Diffstat (limited to 'numpy/distutils/command/build_clib.py')
-rw-r--r-- | numpy/distutils/command/build_clib.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 645c6427a..92498132d 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -10,7 +10,8 @@ from distutils.errors import DistutilsSetupError, DistutilsError, \ from numpy.distutils import log from distutils.dep_util import newer_group from numpy.distutils.misc_util import filter_sources, has_f_sources,\ - has_cxx_sources, all_strings, get_lib_source_files, is_sequence + has_cxx_sources, all_strings, get_lib_source_files, is_sequence, \ + get_numpy_include_dirs # Fix Python distutils bug sf #1718574: _l = old_build_clib.user_options @@ -162,8 +163,11 @@ class build_clib(old_build_clib): macros = build_info.get('macros') include_dirs = build_info.get('include_dirs') + if include_dirs is None: + include_dirs = [] extra_postargs = build_info.get('extra_compiler_args') or [] + include_dirs.extend(get_numpy_include_dirs()) # where compiled F90 module files are: module_dirs = build_info.get('module_dirs') or [] module_build_dir = os.path.dirname(lib_file) |