Skip to content
Snippets Groups Projects
Commit ff23e039 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/{ → py-}hpp-bezier-com-traj] add PYTHON_NOTAG_CONFLICT

parent d2a5aad3
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,6 @@ SUBDIR+= hey5-description ...@@ -27,7 +27,6 @@ SUBDIR+= hey5-description
SUBDIR+= histodet SUBDIR+= histodet
SUBDIR+= hpp-affordance SUBDIR+= hpp-affordance
SUBDIR+= hpp-benchmark SUBDIR+= hpp-benchmark
SUBDIR+= hpp-bezier-com-traj
SUBDIR+= hpp-centroidal-dynamics SUBDIR+= hpp-centroidal-dynamics
SUBDIR+= hpp-environments SUBDIR+= hpp-environments
SUBDIR+= hpp-hrp2 SUBDIR+= hpp-hrp2
...@@ -93,6 +92,7 @@ SUBDIR+= py-example-robot-data ...@@ -93,6 +92,7 @@ SUBDIR+= py-example-robot-data
SUBDIR+= py-hqp SUBDIR+= py-hqp
SUBDIR+= py-hpp-affordance-corba SUBDIR+= py-hpp-affordance-corba
SUBDIR+= py-hpp-baxter SUBDIR+= py-hpp-baxter
SUBDIR+= py-hpp-bezier-com-traj
SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-corba
SUBDIR+= py-mavlink SUBDIR+= py-mavlink
SUBDIR+= py-morse SUBDIR+= py-morse
......
...@@ -19,7 +19,7 @@ include ../../path/hpp-util/depend.mk ...@@ -19,7 +19,7 @@ include ../../path/hpp-util/depend.mk
include ../../path/hpp-statistics/depend.mk include ../../path/hpp-statistics/depend.mk
include ../../path/hpp-fcl/depend.mk include ../../path/hpp-fcl/depend.mk
include ../../path/hpp-constraints/depend.mk include ../../path/hpp-constraints/depend.mk
include ../../wip/hpp-bezier-com-traj/depend.mk include ../../wip/py-hpp-bezier-com-traj/depend.mk
include ../../wip/hpp-centroidal-dynamics/depend.mk include ../../wip/hpp-centroidal-dynamics/depend.mk
include ../../wip/hpp-affordance/depend.mk include ../../wip/hpp-affordance/depend.mk
include ../../wip/hpp-spline/depend.mk include ../../wip/hpp-spline/depend.mk
......
File moved
# robotpkg Makefile for: wip/hpp-bezier-com-traj # robotpkg Makefile for: wip/py-hpp-bezier-com-traj
# Created: Guilhem Saurel on Fri, 4 Jan 2019 # Created: Guilhem Saurel on Fri, 4 Jan 2019
# #
HPP_PACKAGE= hpp-bezier-com-traj HPP_PACKAGE= hpp-bezier-com-traj
HPP_COMMENT= trajectory generation for the COM with bezier curves HPP_COMMENT= trajectory generation for the COM with bezier curves
CATEGORIES= wip CATEGORIES= wip
USE_BOOST_LIBS= python USE_BOOST_LIBS= python
USE_PYTHON= true USE_PYTHON= true
PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common include ../../meta-pkgs/hpp/Makefile.common
......
File moved
# robotpkg depend.mk for: wip/hpp-bezier-com-traj # robotpkg depend.mk for: wip/py-hpp-bezier-com-traj
# Created: Guilhem Saurel on Fri, 19 Oct 2018 # Created: Guilhem Saurel on Fri, 19 Oct 2018
# #
DEPEND_DEPTH:= ${DEPEND_DEPTH}+ DEPEND_DEPTH:= ${DEPEND_DEPTH}+
HPP_BEZIER_COM_TRAJ_DEPEND_MK:= ${HPP_BEZIER_COM_TRAJ_DEPEND_MK}+ PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK:= ${PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH)) ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hpp-bezier-com-traj DEPEND_PKG+= py-hpp-bezier-com-traj
endif endif
ifeq (+,$(HPP_BEZIER_COM_TRAJ_DEPEND_MK)) # -------------------------------------- ifeq (+,$(PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK)) # --------------------------------------
include ../../mk/sysdep/python.mk include ../../mk/sysdep/python.mk
PREFER.hpp-bezier-com-traj?= robotpkg PREFER.py-hpp-bezier-com-traj?= robotpkg
DEPEND_USE+= hpp-bezier-com-traj DEPEND_USE+= py-hpp-bezier-com-traj
DEPEND_ABI.hpp-bezier-com-traj?= ${PKGTAG.python-}hpp-bezier-com-traj>=4.7.0 DEPEND_ABI.py-hpp-bezier-com-traj?= ${PKGTAG.python-}hpp-bezier-com-traj>=4.7.0
DEPEND_DIR.hpp-bezier-com-traj?= ../../wip/hpp-bezier-com-traj DEPEND_DIR.py-hpp-bezier-com-traj?= ../../wip/py-hpp-bezier-com-traj
SYSTEM_SEARCH.hpp-bezier-com-traj=\ SYSTEM_SEARCH.py-hpp-bezier-com-traj=\
include/hpp/bezier-com-traj/config.hh \ include/hpp/bezier-com-traj/config.hh \
lib/libhpp-bezier-com-traj.so \ lib/libhpp-bezier-com-traj.so \
'lib/pkgconfig/hpp-bezier-com-traj.pc:/Version/s/[^0-9.]//gp' 'lib/pkgconfig/hpp-bezier-com-traj.pc:/Version/s/[^0-9.]//gp'
endif # HPP_BEZIER_COM_TRAJ_DEPEND_MK -------------------------------------------- endif # PY_HPP_BEZIER_COM_TRAJ_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment