From b703c214662d61378354ab617abde36dd9944efb Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 7 Oct 2019 13:06:16 +0200 Subject: [PATCH] [wip/hpp-universal-robot] add missing USE_PYTHON --- hpp-universal-robot/Makefile | 2 +- hpp-universal-robot/depend.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hpp-universal-robot/Makefile b/hpp-universal-robot/Makefile index 141c43bb..8fa89d58 100644 --- a/hpp-universal-robot/Makefile +++ b/hpp-universal-robot/Makefile @@ -6,12 +6,12 @@ HPP_PACKAGE= hpp-universal-robot HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver CATEGORIES= wip +USE_PYTHON= true include ../../meta-pkgs/hpp/Makefile.common include ../../wip/example-robot-data/depend.mk -include ../../mk/sysdep/python.mk include ../../mk/language/c.mk include ../../mk/language/c++11.mk include ../../mk/robotpkg.mk diff --git a/hpp-universal-robot/depend.mk b/hpp-universal-robot/depend.mk index ffeef54d..be36616c 100644 --- a/hpp-universal-robot/depend.mk +++ b/hpp-universal-robot/depend.mk @@ -11,11 +11,13 @@ endif ifeq (+,$(HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # -------------------------------------- +include ../../mk/sysdep/python.mk + PREFER.hpp-universal-robot?= robotpkg DEPEND_USE+= hpp-universal-robot -DEPEND_ABI.hpp-universal-robot?= hpp-universal-robot>=4.2.1 +DEPEND_ABI.hpp-universal-robot?= ${PKGTAG.python-}hpp-universal-robot>=4.7.0 DEPEND_DIR.hpp-universal-robot?= ../../wip/hpp-universal-robot SYSTEM_SEARCH.hpp-universal-robot=\ -- GitLab