From e630a01a3779da36b5258f203dead41fe9cf6b0c Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Thu, 15 Jun 2017 15:05:27 +0200
Subject: [PATCH] [wip/talos-roboticsgroup-gazebo-plugins] Add missing
dependencies
Add dependency on gazebo and gazebo-ros-pkgs.
While here, clean up the Makefile.
---
talos-roboticsgroup-gazebo-plugins/Makefile | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/talos-roboticsgroup-gazebo-plugins/Makefile b/talos-roboticsgroup-gazebo-plugins/Makefile
index 32c9958f..01119c16 100644
--- a/talos-roboticsgroup-gazebo-plugins/Makefile
+++ b/talos-roboticsgroup-gazebo-plugins/Makefile
@@ -2,13 +2,9 @@
# Created: Olivier Stasse on Fri, 21 Apr 2017
#
VERSION= 0.0.3
-PKGBASE= talos-roboticsgroup-gazebo-plugins
-PKGNAME= ${PKGBASE}-${VERSION}
+PKGNAME= talos-roboticsgroup-gazebo-plugins-${VERSION}
DISTNAME= $(subst -,_,${PKGBASE})-${VERSION}
-ROS_GITTAG= ${DISTNAME}
-WRKSRC= ${WRKDIR}/${ROS_GITTAG}
-
CATEGORIES= wip
MASTER_SITES= ${MASTER_SITE_JRL:=talos/talos_roboticsgroup_gazebo_plugins/}
LICENSE= openhrp-grx-license
@@ -17,7 +13,9 @@ RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
NO_PUBLIC_BIN= ${RESTRICTED}
-CMAKE_PREFIX_PATH+= ${ROBOTPKG_BASE}
+CMAKE_ARGS+=\
+ -Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \
+ -Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
@@ -32,9 +30,10 @@ include ../../lang/ros-message-runtime/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
-include ../../wip/talos-pal-hardware-interfaces/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
+include ../../simulation/gazebo-ros-pkgs/depend.mk
+include ../../wip/talos-pal-hardware-interfaces/depend.mk
+include ../../mk/sysdep/gazebo.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
-
--
GitLab