diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-07-26 11:03:34 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-07-26 11:03:34 +0000 |
| commit | 27160564fa6d81889ec8ed53cf8f263cfbec476e (patch) | |
| tree | 4be6c056b854f4e3bfb963c6a94d2d5f418edb5f | |
| parent | 0a34a25112328173eed3dafe20bdb0ff7371d2fa (diff) | |
| download | numpy-27160564fa6d81889ec8ed53cf8f263cfbec476e.tar.gz | |
Add a new function to add installed library - do nothing for now.
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/misc_util.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index c2161f0ba..d5d72dceb 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -577,7 +577,7 @@ def configuration(parent_package='',top_path=None): # (don't ask). Because clib are generated before extensions, we have to # explicitly add an extension which has generate_config_h and # generate_numpyconfig_h as sources *before* adding npymath. - config.add_library('npymath', + config.add_installed_library('npymath', sources=[join('src', 'npymath', 'npy_math.c.src')]) multiarray_deps = [ diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index ecd60375e..20b414613 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1190,6 +1190,14 @@ class Configuration(object): self.warn('distutils distribution has been initialized,'\ ' it may be too late to add a library '+ name) + def add_installed_library(self, name, sources, build_info=None): + """Add installable library to configuration. + """ + if not build_info: + self.add_library(name, sources) + else: + self.add_library(name, sources, **build_info) + def add_sconscript(self, sconscript, subpackage_path=None, standalone = False, pre_hook = None, post_hook = None, source_files = None): |