Fixing package dependencies

Signed-off-by: Nordmann Arne (CR/ADT3) <[email protected]>

Author: norro

system_modes_examples/CMakeLists.txt

@@ -17,28 +17,15 @@ endif()
 
 # find dependencies
 find_package(ament_cmake REQUIRED)
-find_package(rclcpp REQUIRED)
-find_package(rcl_lifecycle REQUIRED)
-find_package(rclcpp_lifecycle REQUIRED)
-find_package(rosidl_typesupport_cpp REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
-find_package(lifecycle_msgs REQUIRED)
 find_package(system_modes REQUIRED)
-find_package(system_modes_msgs REQUIRED)
 
 # drive_base
 add_executable(drive_base src/drive_base.cpp)
 target_include_directories(drive_base PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 ament_target_dependencies(drive_base
-  "rclcpp"
-  "rcl_lifecycle"
-  "rclcpp_lifecycle"
-  "lifecycle_msgs"
-  "rosidl_typesupport_cpp"
   "system_modes"
-  "system_modes_msgs"
 )
 install(TARGETS drive_base
   EXPORT export_${PROJECT_NAME}
@@ -50,13 +37,7 @@ target_include_directories(manipulator PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 ament_target_dependencies(manipulator
-  "rclcpp"
-  "rcl_lifecycle"
-  "rclcpp_lifecycle"
-  "lifecycle_msgs"
-  "rosidl_typesupport_cpp"
   "system_modes"
-  "system_modes_msgs"
 )
 install(TARGETS manipulator
   EXPORT export_${PROJECT_NAME}

system_modes_msgs/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
+
 project(system_modes_msgs)
 
 # Default to C++14
@@ -10,7 +11,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 find_package(ament_cmake REQUIRED)
-find_package(ament_cmake_cppcheck REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
 
 # generate service

system_modes_msgs/package.xml

@@ -15,12 +15,14 @@
   <url type="bugtracker">https://github.com/micro-ROS/system_modes/issues</url>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
-  <depend>builtin_interfaces</depend>
-  <depend>rosidl_default_generators</depend>
+  <exec_depend>rosidl_default_runtime</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
+  <test_depend>ament_lint_common</test_depend>
   <test_depend>ament_cmake_cppcheck</test_depend>
+  <test_depend>ament_cmake_cpplint</test_depend>
 
   <member_of_group>rosidl_interface_packages</member_of_group>