2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00

Add include path for NumPy extension.

This commit is contained in:
Stefan Seefeld
2016-10-20 17:24:36 -04:00
parent 898ab3d86b
commit 4b099e76b0

View File

@@ -838,11 +838,10 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
if $(result[2]) = 0
{
.numpy = true ;
numpy-include = $(result[1]) ;
.numpy-include = $(result[1]) ;
}
else
{
.numpy = false ;
debug-message "NumPy not configured. Reason:" ;
debug-message " $(full-cmd) aborted with " ;
debug-message " $(result[1])" ;
@@ -1036,6 +1035,11 @@ rule numpy ( )
return $(.numpy) ;
}
rule numpy-include ( )
{
return $(.numpy-include) ;
}
type.register PYTHON_EXTENSION : : SHARED_LIB ;
@@ -1296,6 +1300,7 @@ rule bpl-test ( name : sources * : requirements * )
# Masked whenever NumPy is not enabled.
rule numpy-test ( name : sources * : requirements * )
{
numpy-include = [ python.numpy-include ] ;
# yuk !
if $(.numpy) = false
{
@@ -1304,7 +1309,8 @@ rule numpy-test ( name : sources * : requirements * )
sources ?= $(name).py $(name).cpp ;
return [ testing.make-test run-pyd
: $(sources) /boost/python//boost_numpy /boost/python//boost_python
: $(requirements) : $(name) ] ;
: $(requirements) <include>$(numpy-include)
: $(name) ] ;
}
IMPORT $(__name__) : bpl-test : : bpl-test ;