Merge pull request #773 from ros-planning/packaging_fixes

packaging fixes
ros-planning · Jul 31, 2018 · de2bca5 · de2bca5
2 parents 6b8f276 + eea2358
commit de2bca5
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 53 deletions.
diff --git a/amcl/CMakeLists.txt b/amcl/CMakeLists.txt
@@ -2,19 +2,20 @@ cmake_minimum_required(VERSION 2.8.3)
 project(amcl)
 
 find_package(catkin REQUIRED
-        COMPONENTS
-            message_filters
-            rosbag
-            roscpp
-            std_srvs
-            tf2
-            tf2_geometry_msgs
-            tf2_ros
-            dynamic_reconfigure
-            nav_msgs
-            sensor_msgs
-            std_srvs
-        )
+  COMPONENTS
+    dynamic_reconfigure
+    geometry_msgs
+    message_filters
+    nav_msgs
+    rosbag
+    roscpp
+    sensor_msgs
+    std_srvs
+    tf2
+    tf2_geometry_msgs
+    tf2_msgs
+    tf2_ros
+)
 
 find_package(Boost REQUIRED)
 
@@ -24,12 +25,17 @@ generate_dynamic_reconfigure_options(
 )
 
 catkin_package(
-    CATKIN_DEPENDS
-        rosbag
-        roscpp
-        dynamic_reconfigure
-        tf2_ros
-  CATKIN_DEPENDS nav_msgs std_srvs
+  CATKIN_DEPENDS
+    dynamic_reconfigure
+    geometry_msgs
+    nav_msgs
+    rosbag
+    roscpp
+    sensor_msgs
+    std_srvs
+    tf2
+    tf2_msgs
+    tf2_ros
   INCLUDE_DIRS include
   LIBRARIES amcl_sensors amcl_map amcl_pf
 )

diff --git a/amcl/package.xml b/amcl/package.xml
@@ -29,11 +29,14 @@
     <build_depend>tf2_geometry_msgs</build_depend>
 
     <depend>dynamic_reconfigure</depend>
+    <depend>geometry_msgs</depend>
     <depend>nav_msgs</depend>
     <depend>rosbag</depend>
     <depend>roscpp</depend>
-    <depend>std_srvs</depend>
     <depend>sensor_msgs</depend>
+    <depend>std_srvs</depend>
+    <depend>tf2</depend>
+    <depend>tf2_msgs</depend>
     <depend>tf2_ros</depend>
 
     <test_depend>map_server</test_depend>

diff --git a/base_local_planner/CMakeLists.txt b/base_local_planner/CMakeLists.txt
@@ -14,7 +14,9 @@ find_package(catkin REQUIRED
             pluginlib
             roscpp
             rospy
+            sensor_msgs
             std_msgs
+            tf2
             tf2_geometry_msgs
             tf2_ros
             voxel_grid
@@ -68,8 +70,11 @@ catkin_package(
         nav_msgs
         pluginlib
         roscpp
+        sensor_msgs
         std_msgs
+        tf2
         tf2_ros
+        voxel_grid
 )
 
 #uncomment for profiling

diff --git a/base_local_planner/package.xml b/base_local_planner/package.xml
@@ -31,10 +31,12 @@
     <depend>nav_core</depend>
     <depend>nav_msgs</depend>
     <depend>pluginlib</depend>
+    <depend>sensor_msgs</depend>
     <depend>std_msgs</depend>
     <depend>rosconsole</depend>
     <depend>roscpp</depend>
     <depend>rospy</depend>
+    <depend>tf2</depend>
     <depend>tf2_ros</depend>
     <depend>visualization_msgs</depend>
     <depend>voxel_grid</depend>

diff --git a/carrot_planner/CMakeLists.txt b/carrot_planner/CMakeLists.txt
@@ -2,15 +2,16 @@ cmake_minimum_required(VERSION 2.8.3)
 project(carrot_planner)
 
 find_package(catkin REQUIRED
-        COMPONENTS
-            roscpp
-            nav_core
-            costmap_2d
-            base_local_planner
-            pluginlib
-            tf2_geometry_msgs
-            tf2_ros
-        )
+  COMPONENTS
+    base_local_planner
+    costmap_2d
+    nav_core
+    pluginlib
+    roscpp
+    tf2
+    tf2_geometry_msgs
+    tf2_ros
+)
 
 include_directories(
     include 
@@ -19,14 +20,16 @@ include_directories(
 add_definitions(${EIGEN3_DEFINITIONS})
 
 catkin_package(
-    INCLUDE_DIRS include
-    LIBRARIES carrot_planner
-    CATKIN_DEPENDS
-        roscpp
-        pluginlib
-        costmap_2d
-        base_local_planner
-        nav_core
+  INCLUDE_DIRS include
+  LIBRARIES carrot_planner
+  CATKIN_DEPENDS
+    base_local_planner
+    costmap_2d
+    nav_core
+    pluginlib
+    roscpp
+    tf2
+    tf2_ros
 )
 
 add_library(carrot_planner src/carrot_planner.cpp)

diff --git a/carrot_planner/package.xml b/carrot_planner/package.xml
@@ -20,13 +20,14 @@
     <buildtool_depend>catkin</buildtool_depend>
 
     <build_depend>tf2_geometry_msgs</build_depend>
-    <!--<depend>angles</depend>-->
+
     <depend>base_local_planner</depend>
     <depend>costmap_2d</depend>
     <depend>eigen</depend>
     <depend>nav_core</depend>
     <depend>pluginlib</depend>
     <depend>roscpp</depend>
+    <depend>tf2</depend>
     <depend>tf2_ros</depend>
 
     <export>

diff --git a/costmap_2d/CMakeLists.txt b/costmap_2d/CMakeLists.txt
@@ -15,14 +15,14 @@ find_package(catkin REQUIRED
             roscpp
             sensor_msgs
             std_msgs
+            tf2
             tf2_geometry_msgs
             tf2_ros
             tf2_sensor_msgs
             visualization_msgs
             voxel_grid
         )
 
-remove_definitions(-DDISABLE_LIBUSB-1.0)
 find_package(Eigen3 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system thread)
 include_directories(

diff --git a/costmap_2d/package.xml b/costmap_2d/package.xml
@@ -40,6 +40,7 @@
     <depend>rostest</depend>
     <depend>sensor_msgs</depend>
     <depend>std_msgs</depend>
+    <depend>tf2</depend>
     <depend>tf2_ros</depend>
     <depend>visualization_msgs</depend>
     <depend>voxel_grid</depend>

diff --git a/dwa_local_planner/CMakeLists.txt b/dwa_local_planner/CMakeLists.txt
@@ -3,14 +3,18 @@ project(dwa_local_planner)
 
 find_package(catkin REQUIRED
         COMPONENTS
+            angles
             base_local_planner
             cmake_modules
             costmap_2d
             dynamic_reconfigure
             nav_core
             nav_msgs
             pluginlib
+            sensor_msgs
             roscpp
+            tf2
+            tf2_geometry_msgs
             tf2_ros
         )
 
@@ -32,10 +36,14 @@ catkin_package(
     INCLUDE_DIRS include
     LIBRARIES dwa_local_planner
     CATKIN_DEPENDS
+        base_local_planner
         dynamic_reconfigure
         nav_msgs
         pluginlib
+        sensor_msgs
         roscpp
+        tf2
+        tf2_ros
 )
 
 add_library(dwa_local_planner src/dwa_planner.cpp src/dwa_planner_ros.cpp)

diff --git a/dwa_local_planner/package.xml b/dwa_local_planner/package.xml
@@ -25,6 +25,7 @@
 
     <buildtool_depend>catkin</buildtool_depend>
 
+    <build_depend>angles</build_depend>
     <build_depend>cmake_modules</build_depend>
 
     <depend>base_local_planner</depend>
@@ -34,7 +35,10 @@
     <depend>nav_core</depend>
     <depend>nav_msgs</depend>
     <depend>pluginlib</depend>
+    <depend>sensor_msgs</depend>
     <depend>roscpp</depend>
+    <depend>tf2</depend>
+    <depend>tf2_geometry_msgs</depend>
     <depend>tf2_ros</depend>
 
     <export>

diff --git a/rotate_recovery/CMakeLists.txt b/rotate_recovery/CMakeLists.txt
@@ -2,15 +2,19 @@ cmake_minimum_required(VERSION 2.8.3)
 project(rotate_recovery)
 
 find_package(catkin REQUIRED
-        COMPONENTS
-            cmake_modules
-            roscpp
-            tf2_ros
-            costmap_2d
-            nav_core
-            pluginlib
-            base_local_planner
-        )
+  COMPONENTS
+    angles
+    base_local_planner
+    cmake_modules
+    costmap_2d
+    geometry_msgs
+    nav_core
+    pluginlib
+    roscpp
+    tf2
+    tf2_geometry_msgs
+    tf2_ros
+)
 
 find_package(Eigen3 REQUIRED)
 include_directories(
@@ -21,11 +25,16 @@ include_directories(
 add_definitions(${EIGEN3_DEFINITIONS})
 
 catkin_package(
-    INCLUDE_DIRS include
-    LIBRARIES rotate_recovery
-    CATKIN_DEPENDS
-        roscpp
-        pluginlib
+  INCLUDE_DIRS include
+  LIBRARIES rotate_recovery
+  CATKIN_DEPENDS
+    costmap_2d
+    geometry_msgs
+    nav_core
+    pluginlib
+    roscpp
+    tf2
+    tf2_ros
 )
 
 add_library(rotate_recovery src/rotate_recovery.cpp)

diff --git a/rotate_recovery/package.xml b/rotate_recovery/package.xml
@@ -18,14 +18,18 @@
 
     <buildtool_depend>catkin</buildtool_depend>
 
+    <build_depend>angles</build_depend>
     <build_depend>base_local_planner</build_depend>
     <build_depend>cmake_modules</build_depend>
 
     <depend>costmap_2d</depend>
     <depend>eigen</depend>
+    <depend>geometry_msgs</depend>
     <depend>nav_core</depend>
     <depend>pluginlib</depend>
     <depend>roscpp</depend>
+    <depend>tf2</depend>
+    <depend>tf2_geometry_msgs</depend>
     <depend>tf2_ros</depend>
 
     <export>