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

[wip/{ → py-}hpp-rbprm-robot-data] add PYTHON_NOTAG_CONFLICT

parent a182e673
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-rbprm-robot-data
SUBDIR+= hpp-romeo SUBDIR+= hpp-romeo
SUBDIR+= hpp-spline SUBDIR+= hpp-spline
SUBDIR+= hpp-universal-robot SUBDIR+= hpp-universal-robot
...@@ -94,6 +93,7 @@ SUBDIR+= py-hpp-environments ...@@ -94,6 +93,7 @@ SUBDIR+= py-hpp-environments
SUBDIR+= py-hpp-hrp2 SUBDIR+= py-hpp-hrp2
SUBDIR+= py-hpp-rbprm SUBDIR+= py-hpp-rbprm
SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-corba
SUBDIR+= py-hpp-rbprm-robot-data
SUBDIR+= py-mavlink SUBDIR+= py-mavlink
SUBDIR+= py-morse SUBDIR+= py-morse
SUBDIR+= py-mraa SUBDIR+= py-mraa
......
File moved
# robotpkg Makefile for: wip/hpp-rbprm-robot-data # robotpkg Makefile for: wip/py-hpp-rbprm-robot-data
# Created: Guilhem Saurel on fri, 4 Jan 2019 # Created: Guilhem Saurel on fri, 4 Jan 2019
# #
HPP_PACKAGE= hpp-rbprm-robot-data HPP_PACKAGE= hpp-rbprm-robot-data
HPP_COMMENT= file database HPP_COMMENT= file database
PKGREVISION= 2 PKGREVISION= 2
CATEGORIES= wip CATEGORIES= wip
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-rbprm-robot-data # robotpkg depend.mk for: wip/py-hpp-rbprm-robot-data
# Created: Guilhem Saurel on Fri, 4 Jan 2019 # Created: Guilhem Saurel on Fri, 4 Jan 2019
# #
DEPEND_DEPTH:= ${DEPEND_DEPTH}+ DEPEND_DEPTH:= ${DEPEND_DEPTH}+
HPP_RBPRM_ROBOT_DATA_DEPEND_MK:= ${HPP_RBPRM_ROBOT_DATA_DEPEND_MK}+ PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK:= ${PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH)) ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hpp-rbprm-robot-data DEPEND_PKG+= py-hpp-rbprm-robot-data
endif endif
ifeq (+,$(HPP_RBPRM_ROBOT_DATA_DEPEND_MK)) # -------------------------------------- ifeq (+,$(PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK)) # --------------------------------------
include ../../mk/sysdep/python.mk include ../../mk/sysdep/python.mk
PREFER.hpp-rbprm-robot-data?= robotpkg PREFER.py-hpp-rbprm-robot-data?= robotpkg
DEPEND_USE+= hpp-rbprm-robot-data DEPEND_USE+= py-hpp-rbprm-robot-data
DEPEND_ABI.hpp-rbprm-robot-data?= ${PKGTAG.python-}hpp-rbprm-robot-data>=4.7.0 DEPEND_ABI.py-hpp-rbprm-robot-data?= ${PKGTAG.python-}hpp-rbprm-robot-data>=4.7.0
DEPEND_DIR.hpp-rbprm-robot-data?= ../../wip/hpp-rbprm-robot-data DEPEND_DIR.py-hpp-rbprm-robot-data?= ../../wip/py-hpp-rbprm-robot-data
SYSTEM_SEARCH.hpp-rbprm-robot-data=\ SYSTEM_SEARCH.py-hpp-rbprm-robot-data=\
include/hpp/rbprm-robot-data/config.hh \ include/hpp/rbprm-robot-data/config.hh \
'lib/pkgconfig/hpp-rbprm-robot-data.pc:/Version/s/[^0-9.]//gp' 'lib/pkgconfig/hpp-rbprm-robot-data.pc:/Version/s/[^0-9.]//gp'
endif # HPP_RBPRM_ROBOT_DATA_DEPEND_MK -------------------------------------------- endif # PY_HPP_RBPRM_ROBOT_DATA_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
File moved
...@@ -12,7 +12,7 @@ PYTHON_NOTAG_CONFLICT= yes ...@@ -12,7 +12,7 @@ PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common include ../../meta-pkgs/hpp/Makefile.common
include ../../wip/hpp-rbprm-robot-data/depend.mk include ../../wip/py-hpp-rbprm-robot-data/depend.mk
include ../../wip/py-hpp-environments/depend.mk include ../../wip/py-hpp-environments/depend.mk
include ../../path/hpp-core/depend.mk include ../../path/hpp-core/depend.mk
......
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