MAINT: add src/private in build_dir to include search paths

allows generating headers like npy_partition.h with the code generator
jtratner · Oct 14, 2013 · 10ce5b2 · 10ce5b2
1 parent 681025d
commit 10ce5b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 562 deletions.
diff --git a/numpy/core/bento.info b/numpy/core/bento.info
@@ -10,6 +10,7 @@ Library:
             src/npymath/halffloat.c
     CompiledLibrary: npysort
         Sources:
+            src/private/npy_partition.h.src
             src/npysort/quicksort.c.src,
             src/npysort/mergesort.c.src,
             src/npysort/heapsort.c.src,

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -529,6 +529,10 @@ def generate_config_h(ext, build_dir):
 
     def generate_numpyconfig_h(ext, build_dir):
         """Depends on config.h: generate_config_h has to be called before !"""
+        # put private include directory in build_dir on search path
+        # allows using code generation in headers headers
+        config.add_include_dirs(join(build_dir, "src", "private"))
+
         target = join(build_dir, header_dir, '_numpyconfig.h')
         d = os.path.dirname(target)
         if not os.path.exists(d):
@@ -697,10 +701,17 @@ def get_mathlib_info(*args):
 
     # This library is created for the build but it is not installed
     config.add_library('npysort',
-            sources = [join('src', 'npysort', 'quicksort.c.src'),
-                       join('src', 'npysort', 'mergesort.c.src'),
-                       join('src', 'npysort', 'heapsort.c.src'),
-                       join('src', 'npysort', 'selection.c.src')])
+                       sources=[join('src', 'npysort', 'quicksort.c.src'),
+                                join('src', 'npysort', 'mergesort.c.src'),
+                                join('src', 'npysort', 'heapsort.c.src'),
+                                join('src','private', 'npy_partition.h.src'),
+                                join('src', 'npysort', 'selection.c.src')],
+                       deps=[join('src', 'npysort', 'quicksort.c'),
+                             join('src', 'npysort', 'mergesort.c'),
+                             join('src', 'npysort', 'heapsort.c'),
+                             join('src', 'private', 'npy_partition.h'),
+                             join('src', 'npysort', 'selection.c')],
+                       include_dirs=[])
 
 
     #######################################################################