From c12dea3f0ade7dd844db78a87cc448df42ddf7fa Mon Sep 17 00:00:00 2001 From: Olivier Stasse <ostasse@laas.fr> Date: Wed, 11 Jul 2018 17:54:36 +0200 Subject: [PATCH] [wip/talos-metapkg-ros-control-sot] Detects PAL erbium --- talos-metapkg-ros-control-sot/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/talos-metapkg-ros-control-sot/Makefile b/talos-metapkg-ros-control-sot/Makefile index f56da890..c749669d 100644 --- a/talos-metapkg-ros-control-sot/Makefile +++ b/talos-metapkg-ros-control-sot/Makefile @@ -36,8 +36,15 @@ include ../../middleware/ros-actionlib/depend.mk include ../../middleware/ros-comm/depend.mk include ../../motion/ros-control-toolbox/depend.mk include ../../wip/dynamic-graph-bridge-v3/depend.mk -include ../../wip/prf-ros-controllers/depend.mk -include ../../wip/pal-hardware-interfaces/depend.mk + +include ../../wip/sysdep/pal-distro.mk +ifeq (palerbium,${PALDISTRO}) + CMAKE_PREFIX_PATH+=/opt/pal/erbium +else + include ../../wip/pal-hardware-interfaces/depend.mk + include ../../wip/prf-ros-controllers/depend.mk +endif + include ../../wip/roscontrol-sot/depend.mk include ../../mk/language/c++.mk include ../../mk/language/c.mk -- GitLab