diff --git a/py-eigen/Makefile b/py-eigen/Makefile index bc8c50680a26f5961889b5e6869ac78bdfa42fd0..2d90952293c1e848ca728fe2681737d5c6dee9af 100644 --- a/py-eigen/Makefile +++ b/py-eigen/Makefile @@ -23,6 +23,7 @@ CMAKE_ARGS+= -DPYTHON_SITELIB=${PYTHON_SITELIB} DEPEND_ABI.python+= python<3 include ../../mk/sysdep/python.mk +include ../../mk/sysdep/py-numpy.mk include ../../math/eigen3/depend.mk include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk diff --git a/py-eigen/depend.mk b/py-eigen/depend.mk index 1920f469a56ca33a709b57514fa5bedf667b420c..abd5056c34a71f33b169ef7ee649b8275f6ec2c3 100644 --- a/py-eigen/depend.mk +++ b/py-eigen/depend.mk @@ -3,26 +3,25 @@ # DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -PY_EIGEN_DEPEND_MK:= ${PY_EIGEN_DEPEND_MK}+ +EIGENPY_DEPEND_MK:= ${EIGENPY_DEPEND_MK}+ ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= py-eigen +DEPEND_PKG+= eigenpy endif -ifeq (+,$(PY_EIGEN_DEPEND_MK)) # ------------------------------------------- +ifeq (+,$(EIGENPY_DEPEND_MK)) # ------------------------------------------- -PREFER.py-eigen?= robotpkg +PREFER.eigenpy?= robotpkg -SYSTEM_SEARCH.py-eigen=\ +SYSTEM_SEARCH.eigenpy=\ 'lib/pkgconfig/eigenpy.pc:/Version/s/[^0-9.]//gp' -DEPEND_USE+= py-eigen - -DEPEND_ABI.py-eigen?= eigen3 -DEPEND_DIR.py-eigen?= ../../wip/py-eigen +DEPEND_USE+= eigenpy +DEPEND_ABI.eigenpy?= eigenpy>=1.3.0 +DEPEND_DIR.eigenpy?= ../../wip/py-eigen include ../../mk/sysdep/python.mk -endif # PY_EIGEN_DEPEND_MK ------------------------------------------------- +endif # EIGENPY_DEPEND_MK ------------------------------------------------- DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}