From eb8f22c4e97459d5105d28524569cac96ce69b06 Mon Sep 17 00:00:00 2001
From: Alberto Tudela <ajtudela@gmail.com>
Date: Mon, 8 Apr 2024 17:28:26 +0200
Subject: [PATCH] Update scitos2_msgs

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
---
 scitos2_msgs/CMakeLists.txt | 44 +++++++++++--------------------------
 scitos2_msgs/package.xml    | 10 +++++----
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/scitos2_msgs/CMakeLists.txt b/scitos2_msgs/CMakeLists.txt
index b3af620..50c1aa5 100644
--- a/scitos2_msgs/CMakeLists.txt
+++ b/scitos2_msgs/CMakeLists.txt
@@ -15,17 +15,18 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>")
 endif()
 
-################################################
-## Find  dependencies                         ##
-################################################
-## Find ament macros and libraries
+# ###############################################
+# # Find  dependencies                         ##
+# ###############################################
+# # Find ament macros and libraries
 find_package(ament_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
 find_package(std_msgs REQUIRED)
+find_package(builtin_interfaces REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
 
-################################################
-## Declare ROS messages, services and actions ##
-################################################
+# ###############################################
+# # Declare ROS messages, services and actions ##
+# ###############################################
 set(msg_files
   "msg/BarrierStatus.msg"
   "msg/BatteryState.msg"
@@ -52,30 +53,11 @@ set(srv_files
 rosidl_generate_interfaces(${PROJECT_NAME}
   ${msg_files}
   ${srv_files}
-  DEPENDENCIES std_msgs
+  DEPENDENCIES std_msgs builtin_interfaces
 )
 
-###########
-## Build ##
-###########
-
-#############
-## Install ##
-#############
-
-# ############
-# # Testing ##
-# ############
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-
-  # the following line skips the linter which checks for copyrights
-  set(ament_cmake_copyright_FOUND TRUE)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
-###################################
-## ament specific configuration ##
-###################################
+# ##################################
+# # ament specific configuration ##
+# ##################################
 ament_export_dependencies(rosidl_default_runtime)
 ament_package()
\ No newline at end of file
diff --git a/scitos2_msgs/package.xml b/scitos2_msgs/package.xml
index 83f3c26..2b28aa1 100644
--- a/scitos2_msgs/package.xml
+++ b/scitos2_msgs/package.xml
@@ -7,13 +7,15 @@
   <maintainer email="ajtudela@gmail.com">Alberto Tudela</maintainer>
   <license>Apache-2.0</license>
   <author email="ajtudela@gmail.com">Alberto Tudela</author>
+
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <buildtool_depend>rosidl_default_generators</buildtool_depend>
+
   <depend>std_msgs</depend>
-  <exec_depend>rosidl_default_runtime</exec_depend>
+  <depend>builtin_interfaces</depend>
+  <depend>rosidl_default_generators</depend>
+
   <member_of_group>rosidl_interface_packages</member_of_group>
-  <test_depend>ament_lint_auto</test_depend>
-  <test_depend>ament_lint_common</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>