From 10f2a29c52bf078a164881d1f581f8c19ac4e231 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 1 Apr 2019 00:02:32 +0200
Subject: [PATCH] [wip/roscontrol-sot] Makefile can now switch between erbium
and not erbium packages. If PAL packages are installed on xenial
PREFER.pal-distro=erbium is necessary for compiling.
---
roscontrol-sot/Makefile | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/roscontrol-sot/Makefile b/roscontrol-sot/Makefile
index 733c3271..c43d8b63 100644
--- a/roscontrol-sot/Makefile
+++ b/roscontrol-sot/Makefile
@@ -55,12 +55,18 @@ include ../../wip/sysdep/pal-distro.mk
include ../../wip/pal-msgs/depend.mk
include ../../wip/sysdep/pal-distro.mk
-ifeq (palerbium,${PALDISTRO})
- CMAKE_PREFIX_PATH+=/opt/pal/erbium
- SYSTEM_PREFIX+=/opt/pal/erbium
- CXXFLAGS+="-I/opt/pal/erbium/include"
- PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
- include ../../motion/ros-control-toolbox/depend.mk
+ifeq (erbium,${PREFER.pal-distro})
+ ifeq (palerbium,${PALDISTRO})
+ CMAKE_PREFIX_PATH+=/opt/pal/erbium
+ SYSTEM_PREFIX+=/opt/pal/erbium
+ CXXFLAGS+="-I/opt/pal/erbium/include"
+ PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
+ include ../../motion/ros-control-toolbox/depend.mk
+ else
+ include ../../wip/pal-hardware-interfaces/depend.mk
+ include ../../wip/prf-ros-control/depend.mk
+ include ../../wip/prf-ros-controllers/depend.mk
+ endif
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-control/depend.mk
--
GitLab