Skip to content

Commit d2d97bc

Browse files
Fix 'microxrcedds_agent' name and dependency (#279) (#280)
* Fix 'microxrcedds_agent' name and dependency * Set tag of 'microxrcedds_agent' --------- (cherry picked from commit 5e42d6a) Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> Co-authored-by: David Laseca Perez <davidlaseca@eprosima.com>
1 parent 92c512d commit d2d97bc

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

micro_ros_agent/cmake/SuperBuild.cmake

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ unset(_deps)
1919
enable_language(C)
2020
enable_language(CXX)
2121

22-
unset(xrceagent_DIR CACHE)
23-
find_package(xrceagent 3 EXACT QUIET)
24-
if(NOT xrceagent_FOUND)
25-
ExternalProject_Add(xrceagent
22+
unset(microxrcedds_agent_DIR CACHE)
23+
find_package(microxrcedds_agent 3.0.2 QUIET)
24+
if(NOT microxrcedds_agent_FOUND)
25+
ExternalProject_Add(microxrcedds_agent
2626
GIT_REPOSITORY
2727
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
2828
GIT_TAG
29-
v3.0.1
29+
v3.0.2
3030
PREFIX
3131
${PROJECT_BINARY_DIR}/agent
3232
INSTALL_DIR
@@ -51,6 +51,7 @@ if(NOT xrceagent_FOUND)
5151
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
5252
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
5353
)
54+
list(APPEND _deps microxrcedds_agent)
5455
endif()
5556

5657
# Main project.
@@ -64,5 +65,5 @@ ExternalProject_Add(micro_ros_agent
6465
INSTALL_COMMAND
6566
""
6667
DEPENDS
67-
xrceagent
68+
${_deps}
6869
)

micro_ros_agent/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<depend>rmw_fastrtps_shared_cpp</depend>
2121
<depend>rmw_dds_common</depend>
2222
<depend>micro_ros_msgs</depend>
23+
<depend>microxrcedds_agent</depend>
2324

2425
<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
2526
<test_depend>ament_cmake_gtest</test_depend>

0 commit comments

Comments
 (0)