From 0fa9953216dc4f514800e0b0fa2323544bdbd9a0 Mon Sep 17 00:00:00 2001
From: Henry Huang <69825683+hhenry01@users.noreply.github.com>
Date: Wed, 18 Oct 2023 17:52:14 -0700
Subject: [PATCH] Minor workflow updates (#45)

---
 CMakeLists.txt  | 12 ++++++++++--
 functions.cmake |  2 +-
 package.xml     |  1 +
 ros_info.txt    | 10 ++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 611956d..03c263a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,14 +30,22 @@ message(WARNING "Building Network Systems with build type '${CMAKE_BUILD_TYPE}'
         "and flags: '${CMAKE_CXX_FLAGS}'")
 
 # ROS dependencies
+set(ROS_DEPS
+    rclcpp
+    std_msgs
+    custom_interfaces
+)
 find_package(ament_cmake REQUIRED)
-find_package(rclcpp REQUIRED)
-find_package(std_msgs REQUIRED)
+foreach(dep IN LISTS ROS_DEPS)
+    find_package(${dep} REQUIRED)
+endforeach()
+
 
 # Boost
 find_package(Boost 1.74.0 COMPONENTS REQUIRED
     # Insert desired libraries below (see /usr/include/boost/ for available options)
     serialization
+    thread
 )
 
 # MongoDB
diff --git a/functions.cmake b/functions.cmake
index 5e7b802..57e953e 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -17,7 +17,7 @@ function(make_exe module srcs link_libs inc_dirs ${compile_defs})
     set(bin_module bin_${module})
     add_executable(${bin_module} ${srcs})
     target_compile_definitions(${bin_module} PUBLIC ${compile_defs})
-    ament_target_dependencies(${bin_module} PUBLIC rclcpp std_msgs)
+    ament_target_dependencies(${bin_module} PUBLIC ${ROS_DEPS})
     target_link_libraries(${bin_module} PUBLIC ${link_libs})
     target_include_directories(
         ${bin_module} PUBLIC
diff --git a/package.xml b/package.xml
index 274c214..c0c2c28 100755
--- a/package.xml
+++ b/package.xml
@@ -11,6 +11,7 @@
  <buildtool_depend>ament_cmake</buildtool_depend>
  <depend>rclcpp</depend>
  <depend>std_msgs</depend>
+ <depend>custom_interfaces</depend>
  <exec_depend>ros2launch</exec_depend>
 
  <export>
diff --git a/ros_info.txt b/ros_info.txt
index a9797b3..b1136ba 100644
--- a/ros_info.txt
+++ b/ros_info.txt
@@ -2,3 +2,13 @@ PLACEHOLDER_TOPIC_0
 PLACEHOLDER_TOPIC_1
 mock_local_to_remote_transceiver
 mock_remote_to_local_transceiver
+ais_ships
+batteries
+desired_heading
+data_sensors
+global_path
+gps
+mock_gps
+filtered_wind_sensor
+mock_wind_sensors
+wind_sensors