From d341e8dfb5094cfc5ea05a71ba3ddd145a766893 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 1 Apr 2019 17:23:39 +0200
Subject: [PATCH] [wip/pal-hardware-interfaces] Can now handle user preference
to use erbium packages or not
---
pal-hardware-interfaces/Makefile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pal-hardware-interfaces/Makefile b/pal-hardware-interfaces/Makefile
index 784c5bf1..610e6754 100644
--- a/pal-hardware-interfaces/Makefile
+++ b/pal-hardware-interfaces/Makefile
@@ -29,8 +29,15 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/sysdep/pal-distro.mk
-ifeq (palerbium,${PALDISTRO})
- CMAKE_PREFIX_PATH+=/opt/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})
+ CMAKE_PREFIX_PATH+=/opt/pal/erbium
+ else
+ include ../../wip/prf-ros-control/depend.mk
+ endif
else
include ../../wip/prf-ros-control/depend.mk
endif
--
GitLab