harmonize packages

Author: fmessmer

cob_actions/package.xml

@@ -13,8 +13,8 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
-  <depend>action_msgs</depend>
   <depend>builtin_interfaces</depend>
+  <depend>actionlib_msgs</depend>
   <depend>geometry_msgs</depend>
 
   <exec_depend>rosidl_default_runtime</exec_depend>

cob_msgs/CMakeLists.txt

@@ -16,8 +16,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 find_package(ament_cmake REQUIRED)
-find_package(builtin_interfaces REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
+find_package(builtin_interfaces REQUIRED)
 find_package(diagnostic_msgs REQUIRED)
 find_package(std_msgs REQUIRED)
 
@@ -32,7 +32,7 @@ set(msg_files
 )
 rosidl_generate_interfaces(${PROJECT_NAME}
   ${msg_files}
-  DEPENDENCIES std_msgs diagnostic_msgs
+  DEPENDENCIES builtin_interfaces diagnostic_msgs std_msgs
   ADD_LINTER_TESTS
 )
 

cob_msgs/package.xml

@@ -16,13 +16,15 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>builtin_interfaces</depend>
+  <depend>diagnostic_msgs</depend>
+  <depend>std_msgs</depend>
+
   <exec_depend>rosidl_default_runtime</exec_depend>
 
   <test_depend>ament_lint_common</test_depend>
 
   <member_of_group>rosidl_interface_packages</member_of_group>
-  <depend>diagnostic_msgs</depend>
-  <depend>std_msgs</depend>
 
   <export>
     <build_type>ament_cmake</build_type>

cob_srvs/CMakeLists.txt

@@ -17,6 +17,8 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
+find_package(builtin_interfaces REQUIRED)
+find_package(geometry_msgs REQUIRED)
 
 set(srv_files
   "srv/SetFloat.srv"
@@ -25,6 +27,7 @@ set(srv_files
 )
 rosidl_generate_interfaces(${PROJECT_NAME}
   ${srv_files}
+  DEPENDENCIES builtin_interfaces geometry_msgs
   ADD_LINTER_TESTS
 )
 

cob_srvs/package.xml

@@ -17,6 +17,9 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>builtin_interfaces</depend>
+  <depend>geometry_msgs</depend>
+
   <exec_depend>rosidl_default_runtime</exec_depend>
 
   <test_depend>ament_lint_common</test_depend>