From 6dccb7bd0939755c9c5a7f8b492c95cccd4f7d60 Mon Sep 17 00:00:00 2001
From: David Laseca Perez <davidlaseca@eprosima.com>
Date: Mon, 31 Aug 2026 12:00:09 +0200
Subject: [PATCH 1/2] Fix 'microxrcedds_agent' name and dependency

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
---
 micro_ros_agent/cmake/SuperBuild.cmake | 13 +++++++------
 micro_ros_agent/package.xml            |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/micro_ros_agent/cmake/SuperBuild.cmake b/micro_ros_agent/cmake/SuperBuild.cmake
index 3761515..d151f5f 100644
--- a/micro_ros_agent/cmake/SuperBuild.cmake
+++ b/micro_ros_agent/cmake/SuperBuild.cmake
@@ -19,14 +19,14 @@ unset(_deps)
 enable_language(C)
 enable_language(CXX)
 
-unset(xrceagent_DIR CACHE)
-find_package(xrceagent 3 EXACT QUIET)
-if(NOT xrceagent_FOUND)
-    ExternalProject_Add(xrceagent
+unset(microxrcedds_agent_DIR CACHE)
+find_package(microxrcedds_agent 3.0.2 QUIET)
+if(NOT microxrcedds_agent_FOUND)
+    ExternalProject_Add(microxrcedds_agent
             GIT_REPOSITORY
                 https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
             GIT_TAG
-                v3.0.1
+                develop
             PREFIX
                 ${PROJECT_BINARY_DIR}/agent
             INSTALL_DIR
@@ -51,6 +51,7 @@ if(NOT xrceagent_FOUND)
                 -DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
                 -DUAGENT_ISOLATED_INSTALL:BOOL=OFF
             )
+    list(APPEND _deps microxrcedds_agent)
 endif()
 
 # Main project.
@@ -64,5 +65,5 @@ ExternalProject_Add(micro_ros_agent
     INSTALL_COMMAND
         ""
     DEPENDS
-        xrceagent
+        ${_deps}
     )
diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml
index cb312a4..3781f50 100644
--- a/micro_ros_agent/package.xml
+++ b/micro_ros_agent/package.xml
@@ -20,6 +20,7 @@
   <depend>rmw_fastrtps_shared_cpp</depend>
   <depend>rmw_dds_common</depend>
   <depend>micro_ros_msgs</depend>
+  <depend>microxrcedds_agent</depend>
 
   <test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>

From e6a2bbd2f87e18d070f3607f3f5d196a988b2ee6 Mon Sep 17 00:00:00 2001
From: David Laseca Perez <davidlaseca@eprosima.com>
Date: Mon, 31 Aug 2026 12:46:00 +0200
Subject: [PATCH 2/2] Set tag of 'microxrcedds_agent'

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
---
 micro_ros_agent/cmake/SuperBuild.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro_ros_agent/cmake/SuperBuild.cmake b/micro_ros_agent/cmake/SuperBuild.cmake
index d151f5f..abd4eb8 100644
--- a/micro_ros_agent/cmake/SuperBuild.cmake
+++ b/micro_ros_agent/cmake/SuperBuild.cmake
@@ -26,7 +26,7 @@ if(NOT microxrcedds_agent_FOUND)
             GIT_REPOSITORY
                 https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
             GIT_TAG
-                develop
+                v3.0.2
             PREFIX
                 ${PROJECT_BINARY_DIR}/agent
             INSTALL_DIR