From f12a36e2e6cc5bd2adc84f884065e2f975fc22fd Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 1 Apr 2019 17:24:40 +0200
Subject: [PATCH] [wip/talos-simulation] Can now handle user preference to use
erbium packages or not.
---
talos-simulation/Makefile | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/talos-simulation/Makefile b/talos-simulation/Makefile
index f4e13c70..f0c7ede8 100644
--- a/talos-simulation/Makefile
+++ b/talos-simulation/Makefile
@@ -35,9 +35,14 @@ include ../../middleware/ros-comm/depend.mk
# Check if we on a pal distro
include ../../wip/sysdep/pal-distro.mk
-ifeq (palerbium,${PALDISTRO})
- # If yes then it does not make sense to continue
- $(error "talos-simulation is useless on PAL erbium.")
+
+# PREFER.pal-distro gives the user the choice to compile
+# over PAL packages or not.
+ifeq (erbium,${PREFER.pal-distro})
+ ifeq (palerbium,${PALDISTRO})
+ # If yes then it does not make sense to continue
+ $(error "talos-simulation is useless on PAL erbium.")
+ endif
endif
include ../../motion/ros-control-toolbox/depend.mk
--
GitLab