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

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

parent a1a6008a
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,6 @@ SUBDIR+= hey5-description
SUBDIR+= histodet
SUBDIR+= hpp-affordance
SUBDIR+= hpp-benchmark
SUBDIR+= hpp-universal-robot
SUBDIR+= hrp2-14-description
SUBDIR+= hrp2-dev
SUBDIR+= infuse-asn1-conversions
......@@ -94,6 +93,7 @@ SUBDIR+= py-hpp-rbprm-corba
SUBDIR+= py-hpp-rbprm-robot-data
SUBDIR+= py-hpp-romeo
SUBDIR+= py-hpp-spline
SUBDIR+= py-hpp-universal-robot
SUBDIR+= py-mavlink
SUBDIR+= py-morse
SUBDIR+= py-mraa
......
File moved
# robotpkg Makefile for: wip/hpp-universal-robot
# robotpkg Makefile for: wip/py-hpp-universal-robot
# Created: Guilhem Saurel on Fri, 10 Oct 2018
#
HPP_PACKAGE= hpp-universal-robot
HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver
HPP_VERSION= 4.7.1
HPP_PACKAGE= hpp-universal-robot
HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver
HPP_VERSION= 4.7.1
CATEGORIES= wip
USE_PYTHON= true
CATEGORIES= wip
USE_PYTHON= true
PYTHON_NOTAG_CONFLICT= yes
include ../../meta-pkgs/hpp/Makefile.common
......
File moved
# robotpkg depend.mk for: wip/hpp-universal-robot
# robotpkg depend.mk for: wip/py-hpp-universal-robot
# Created: Guilhem Saurel on Fri, 19 Oct 2018
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
HPP_UNIVERSAL_ROBOT_DEPEND_MK:= ${HPP_UNIVERSAL_ROBOT_DEPEND_MK}+
PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK:= ${PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hpp-universal-robot
DEPEND_PKG+= py-hpp-universal-robot
endif
ifeq (+,$(HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
ifeq (+,$(PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
include ../../mk/sysdep/python.mk
PREFER.hpp-universal-robot?= robotpkg
PREFER.py-hpp-universal-robot?= robotpkg
DEPEND_USE+= hpp-universal-robot
DEPEND_USE+= py-hpp-universal-robot
DEPEND_ABI.hpp-universal-robot?= ${PKGTAG.python-}hpp-universal-robot>=4.7.0
DEPEND_DIR.hpp-universal-robot?= ../../wip/hpp-universal-robot
DEPEND_ABI.py-hpp-universal-robot?= ${PKGTAG.python-}hpp-universal-robot>=4.7.0
DEPEND_DIR.py-hpp-universal-robot?= ../../wip/py-hpp-universal-robot
SYSTEM_SEARCH.hpp-universal-robot=\
SYSTEM_SEARCH.py-hpp-universal-robot=\
include/hpp/universal/robot/config.hh \
'lib/pkgconfig/hpp-universal-robot.pc:/Version/s/[^0-9.]//gp'
endif # HPP_UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
endif # PY_HPP_UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
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