From 0a053a50476a218b4162746ec1b4031737f29aea Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 1 Apr 2019 00:04:26 +0200
Subject: [PATCH] [wip/talos-metapkg-ros-control-sot] Switch packages
compilation based PREFER.pal-distro
---
talos-metapkg-ros-control-sot/Makefile | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/talos-metapkg-ros-control-sot/Makefile b/talos-metapkg-ros-control-sot/Makefile
index 21d2eef4..2723838e 100644
--- a/talos-metapkg-ros-control-sot/Makefile
+++ b/talos-metapkg-ros-control-sot/Makefile
@@ -37,15 +37,33 @@ include ../../middleware/ros-comm/depend.mk
include ../../wip/py-dynamic-graph-bridge-v3/depend.mk
include ../../wip/sysdep/pal-distro.mk
-ifeq (palerbium,${PALDISTRO})
- CMAKE_PREFIX_PATH+=/opt/pal/erbium
+
+ifeq (erbium,${PREFER.pal-distro})
+ ifeq (palerbium,${PALDISTRO})
+ CMAKE_PREFIX_PATH+=/opt/pal/erbium
+ else
+ include ../../wip/pal-hardware-interfaces/depend.mk
+ include ../../wip/prf-ros-controllers/depend.mk
+ include ../../motion/ros-control-toolbox/depend.mk
+ endif
+
+displaytalosmetapkg:
+ echo 'PREFER.pal-distro:${PREFER.pal-distro}'
+ echo 'pal-distro-erbium'
+
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
+
+displaytalosmetapkg:
+ echo 'PREFER.pal-distro:${PREFER.pal-distro}'
+ echo 'pal-distro-xenial'
+
endif
include ../../wip/roscontrol-sot/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
+
--
GitLab