diff --git a/hpp-spline/Makefile b/hpp-spline/Makefile index be4274fd9be08a852d15526a626c658fb596f910..da9face4b17c6357873dcf348b28626dcd35a91d 100644 --- a/hpp-spline/Makefile +++ b/hpp-spline/Makefile @@ -8,9 +8,8 @@ HPP_VERSION= 4.5.0 CATEGORIES= wip -DEPEND_ABI.python+= python<3 - USE_BOOST_LIBS= python +USE_PYTHON= true include ../../meta-pkgs/hpp/Makefile.common @@ -20,7 +19,6 @@ include ../../math/eigen3/depend.mk include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk -include ../../mk/sysdep/python.mk include ../../mk/language/c.mk -include ../../mk/language/c++.mk +include ../../mk/language/c++11.mk include ../../mk/robotpkg.mk diff --git a/hpp-spline/PLIST b/hpp-spline/PLIST index ca47c74dddc1236cdbc0a1932afde41c6fb990ee..5b2b352994738b3183f388399a879d018c7bc43a 100644 --- a/hpp-spline/PLIST +++ b/hpp-spline/PLIST @@ -16,4 +16,4 @@ include/hpp/spline/quintic_spline.h include/hpp/spline/spline_deriv_constraint.h include/hpp/spline/warning.hh lib/pkgconfig/hpp-spline.pc -${PYTHON_SITELIB}/hpp_spline${PYTHON_EXT_SUFFIX} +${PYTHON_SITELIB}/hpp_spline.so diff --git a/hpp-spline/depend.mk b/hpp-spline/depend.mk index affcb7157df1a9453af4098886a774539a13914c..db73e0e955607611619840d863738567e5335243 100644 --- a/hpp-spline/depend.mk +++ b/hpp-spline/depend.mk @@ -11,11 +11,13 @@ endif ifeq (+,$(HPP_SPLINE_DEPEND_MK)) # -------------------------------------- +include ../../mk/sysdep/python.mk + PREFER.hpp-spline?= robotpkg DEPEND_USE+= hpp-spline -DEPEND_ABI.hpp-spline?= hpp-spline>=4.2.0 +DEPEND_ABI.hpp-spline?= ${PKGTAG.python-}hpp-spline>=4.5.0 DEPEND_DIR.hpp-spline?= ../../wip/hpp-spline SYSTEM_SEARCH.hpp-spline=\