Compare commits

..

No commits in common. "b2b48d1fce7336787e29dc197e64b60a5952546c" and "cfb071660f59948a745fe730a6348f706ceb1e9e" have entirely different histories.

3 changed files with 2 additions and 5 deletions

View File

@ -19,7 +19,6 @@ find_package(catkin REQUIRED COMPONENTS
loc_core loc_core
amr_comunication amr_comunication
vda5050_msgs vda5050_msgs
move_base_core
) )
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
@ -116,7 +115,7 @@ find_package(robot_cpp REQUIRED)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES amr_control LIBRARIES amr_control
CATKIN_DEPENDS geometry_msgs loc_core nav_2d_utils roscpp rospy std_msgs move_base_core CATKIN_DEPENDS geometry_msgs move_base_core loc_core nav_2d_utils roscpp rospy std_msgs
DEPENDS Boost DEPENDS Boost
) )

View File

@ -60,7 +60,6 @@
<build_depend>loc_core</build_depend> <build_depend>loc_core</build_depend>
<build_depend>amr_comunication</build_depend> <build_depend>amr_comunication</build_depend>
<build_depend>vda5050_msgs</build_depend> <build_depend>vda5050_msgs</build_depend>
<build_depend>move_base_core</build_depend>
<build_export_depend>geometry_msgs</build_export_depend> <build_export_depend>geometry_msgs</build_export_depend>
<build_export_depend>nav_2d_utils</build_export_depend> <build_export_depend>nav_2d_utils</build_export_depend>
@ -73,7 +72,6 @@
<build_export_depend>loc_core</build_export_depend> <build_export_depend>loc_core</build_export_depend>
<build_export_depend>amr_comunication</build_export_depend> <build_export_depend>amr_comunication</build_export_depend>
<build_export_depend>vda5050_msgs</build_export_depend> <build_export_depend>vda5050_msgs</build_export_depend>
<build_export_depend>move_base_core</build_export_depend>
<exec_depend>geometry_msgs</exec_depend> <exec_depend>geometry_msgs</exec_depend>
<exec_depend>move_base_core</exec_depend> <exec_depend>move_base_core</exec_depend>

@ -1 +1 @@
Subproject commit 3ee134687324c11a49ac488c624082fdfe5fbd2a Subproject commit 596e067050ff15f06c75b23452199ef0af42ac56