From b88d37ac976afcf47be52dc308c17f9bc995fc88 Mon Sep 17 00:00:00 2001
From: Michael Carlstrom <rmc@carlstrom.com>
Date: Thu, 15 Feb 2024 21:35:52 -0500
Subject: [PATCH] cool boi fix

---
 Dockerfile                             | 8 ++++++--
 src/surface/flight_control/package.xml | 1 +
 src/surface/gui/package.xml            | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1e01b102..8ffbaf91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,7 @@ WORKDIR /home/${USER_NAME}/rov-24
 COPY pyproject.toml .
 # Copies in ROS deps
 # https://docs.docker.com/engine/reference/builder/#copy---parents
-COPY --parents --chown=${USER_NAME}:${USER_NAME} ./*/*/package.xml ./*/*/*/package.xml ./
+COPY --parents --chown=${USER_NAME}:${USER_NAME} ./*/*/package.xml ./*/*/*/package.xml ./*/*/*/*/package.xml ./
 # Copies in Install Script
 COPY .vscode/install_dependencies.sh .
 
@@ -89,7 +89,11 @@ COPY --chown=${USER_NAME}:${USER_NAME} . .
 ARG EXPECTED_OUTPUT="All system dependencies have been satisfied"
 
 # Checks that all rosdeps are installed.
-RUN if [[ $(rosdep check -r --from-paths src) != "${EXPECTED_OUTPUT}" ]]; then echo "ROS deps not all installed. Trying adding another layer to COPY instruction for ROS deps."; exit 1; fi
+RUN if [[ $(rosdep check -r --from-paths src --ignore-src) != "${EXPECTED_OUTPUT}" ]]; \ 
+  then echo "ROS deps not all installed. Trying adding another layer to COPY instruction for ROS deps."; \
+  rosdep check -r --from-paths src --ignore-src; \
+  exit 1; \
+  fi
 
 RUN . /opt/ros/iron/setup.sh \
   && colcon build --symlink-install
diff --git a/src/surface/flight_control/package.xml b/src/surface/flight_control/package.xml
index 38e5dda4..beedf691 100644
--- a/src/surface/flight_control/package.xml
+++ b/src/surface/flight_control/package.xml
@@ -10,6 +10,7 @@
   <depend>rclpy</depend>
   <depend>sensor_msgs</depend>
 
+  <exec_depend>rov_msgs</exec_depend>
   <exec_depend>ros2launch</exec_depend>
 
   <test_depend>ament_flake8</test_depend>
diff --git a/src/surface/gui/package.xml b/src/surface/gui/package.xml
index 7c151312..1925b0e9 100644
--- a/src/surface/gui/package.xml
+++ b/src/surface/gui/package.xml
@@ -13,6 +13,7 @@
 
   <exec_depend>ros2launch</exec_depend>
   <exec_depend>ros2run</exec_depend>
+  <exec_depend>rov_msgs</exec_depend>
 
   <depend>mavros</depend>