Skip to content
Snippets Groups Projects
Commit d23afbe7 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/talos-gazebo-ros-control] Add *Config.cmake to SYSTEM_SEARCH

This enables mk/sysdep/cmake.mk to automatically add the proper cmake variables
defining the dependency path.

While here, tidy the Makefile and uncomment required dependency on gazebo.
parent 987ad8a0
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ 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 ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
......
......@@ -2,29 +2,28 @@
# Created: Olivier Stasse on Mer, 3 May 2017
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK:= ${TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= talos-gazebo-ros-control
DEPEND_PKG+= talos-gazebo-ros-control
endif
ifeq (+,$(TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK)) # ---------------------------------
ifeq (+,$(TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK)) # ---------------------------
PREFER.talos-gazebo-ros-control?= robotpkg
DEPEND_USE+= talos-gazebo-ros-control
DEPEND_USE+= talos-gazebo-ros-control
DEPEND_ABI.talos-gazebo-ros-control?=\
talos-gazebo-ros-control>=2.6.5
DEPEND_DIR.talos-gazebo-ros-control?=\
../../wip/talos-gazebo-ros-control
DEPEND_ABI.talos-gazebo-ros-control?= talos-gazebo-ros-control>=2.6.5
DEPEND_DIR.talos-gazebo-ros-control?= ../../wip/talos-gazebo-ros-control
SYSTEM_SEARCH.talos-gazebo-ros-control=\
'include/talos_gazebo_ros_control/gazebo_ros_control_plugin.h' \
'share/talos_gazebo_ros_control/cmake/talos_gazebo_ros_controlConfig.cmake' \
'share/talos_gazebo_ros_control/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/talos_gazebo_ros_control.pc:/Version/s/[^0-9.]//gp'
endif # TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK ---------------------------------------
endif # TALOS_GAZEBO_ROS_CONTROL_DEPEND_MK ---------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment