From 175195e79beb8291b1725fb4444bf8c2da823bc5 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 18 Feb 2020 11:31:48 +0100
Subject: [PATCH] [wip/prf-roboticsgroup-gazebo-plugins] remove wrong
dependency
this can't depend on both:
- simulation/gazebo-ros-pkgs
- wip/prf-gazebo-ros-pkgs{,-melodic}
as they conflict.
---
prf-roboticsgroup-gazebo-plugins/Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/prf-roboticsgroup-gazebo-plugins/Makefile b/prf-roboticsgroup-gazebo-plugins/Makefile
index 3cf1f5dc..6eac1a5d 100644
--- a/prf-roboticsgroup-gazebo-plugins/Makefile
+++ b/prf-roboticsgroup-gazebo-plugins/Makefile
@@ -40,7 +40,6 @@ include ../../math/ros-geometry/depend.mk
include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
-include ../../simulation/gazebo-ros-pkgs/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
--
GitLab