From be22713f1a9f5468c953f0a8750d51692893165c Mon Sep 17 00:00:00 2001 From: Charles Lesire <charles.lesire@onera.fr> Date: Wed, 9 Apr 2014 09:20:37 +0200 Subject: [PATCH] Fix dependencies of ros-rviz --- ros-interactive-markers/depend.mk | 2 +- ros-laser-geometry/depend.mk | 2 +- ros-rviz/Makefile | 5 ++++- ros-rviz/depend.mk | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ros-interactive-markers/depend.mk b/ros-interactive-markers/depend.mk index cc6157f2..5dcab97f 100644 --- a/ros-interactive-markers/depend.mk +++ b/ros-interactive-markers/depend.mk @@ -20,7 +20,7 @@ ROS_DEPEND_USE+= ros-interactive-markers DEPEND_ABI.ros+= ros>=groovy DEPEND_ABI.ros-interactive-markers?= ros-interactive-markers>=1.9 -DEPEND_DIR.ros-interactive-markers?= ../../graphics/ros-interactive-markers +DEPEND_DIR.ros-interactive-markers?= ../../wip/ros-interactive-markers DEPEND_ABI.ros-interactive-markers.groovy?= ros-interactive-markers>=1.9<1.10 DEPEND_ABI.ros-interactive-markers.hydro?= ros-interactive-markers>=1.10<1.11 diff --git a/ros-laser-geometry/depend.mk b/ros-laser-geometry/depend.mk index f2f2ca3d..a1046eaa 100644 --- a/ros-laser-geometry/depend.mk +++ b/ros-laser-geometry/depend.mk @@ -20,7 +20,7 @@ ROS_DEPEND_USE+= ros-laser-geometry DEPEND_ABI.ros+= ros>=groovy DEPEND_ABI.ros-laser-geometry?= ros-laser-geometry>=1.5 -DEPEND_DIR.ros-laser-geometry?= ../../graphics/ros-laser-geometry +DEPEND_DIR.ros-laser-geometry?= ../../wip/ros-laser-geometry DEPEND_ABI.ros-laser-geometry.groovy?= ros-laser-geometry>=1.5<1.6 DEPEND_ABI.ros-laser-geometry.hydro?= ros-laser-geometry>=1.6<1.7 diff --git a/ros-rviz/Makefile b/ros-rviz/Makefile index 1af803db..93a23372 100644 --- a/ros-rviz/Makefile +++ b/ros-rviz/Makefile @@ -14,8 +14,11 @@ include ../../meta-pkgs/ros-base/Makefile.common include ../../devel/ros-catkin/depend.mk include ../../wip/ros-laser-geometry/depend.mk include ../../graphics/ros-python-qt-binding/depend.mk -include ../../graphics/urdfdom/depend.mk include ../../wip/ros-interactive-markers/depend.mk +include ../../image/ros-vision-opencv/depend.mk +include ../../image/ros-image-common/depend.mk +include ../../devel/ros-pluginlib/depend.mk +include ../../graphics/ros-robot-model/depend.mk # <build_depend>libqt4-dev</build_depend> # <build_depend>libqt4-opengl-dev</build_depend> # <build_depend>libogre-dev</build_depend> diff --git a/ros-rviz/depend.mk b/ros-rviz/depend.mk index ca7efcd6..08024fb4 100644 --- a/ros-rviz/depend.mk +++ b/ros-rviz/depend.mk @@ -19,7 +19,7 @@ DEPEND_USE+= ros-robot-state-publisher ROS_DEPEND_USE+= ros-robot-state-publisher DEPEND_ABI.ros-robot-state-publisher?= ros-robot-state-publisher>=1.9 -DEPEND_DIR.ros-robot-state-publisher= ../../localization/ros-robot-state-publisher +DEPEND_DIR.ros-robot-state-publisher= ../../wip/ros-robot-state-publisher DEPEND_ABI.ros += ros>=groovy -- GitLab