Skip to content

Commit ab60bc5

Browse files
David-LP99mergify[bot]
authored andcommitted
Fix 'microxrcedds_agent' name and dependency (#279)
* Fix 'microxrcedds_agent' name and dependency Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> * Set tag of 'microxrcedds_agent' Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> --------- Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> (cherry picked from commit 5e42d6a) # Conflicts: # micro_ros_agent/cmake/SuperBuild.cmake
1 parent 6df7af9 commit ab60bc5

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

micro_ros_agent/cmake/SuperBuild.cmake

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

22+
<<<<<<< HEAD
2223
unset(xrceagent_DIR CACHE)
2324
find_package(xrceagent 2 EXACT QUIET)
2425
if(NOT xrceagent_FOUND)
@@ -27,6 +28,16 @@ if(NOT xrceagent_FOUND)
2728
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
2829
GIT_TAG
2930
v2.4.3
31+
=======
32+
unset(microxrcedds_agent_DIR CACHE)
33+
find_package(microxrcedds_agent 3.0.2 QUIET)
34+
if(NOT microxrcedds_agent_FOUND)
35+
ExternalProject_Add(microxrcedds_agent
36+
GIT_REPOSITORY
37+
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
38+
GIT_TAG
39+
v3.0.2
40+
>>>>>>> 5e42d6a (Fix 'microxrcedds_agent' name and dependency (#279))
3041
PREFIX
3142
${PROJECT_BINARY_DIR}/agent
3243
INSTALL_DIR
@@ -51,6 +62,7 @@ if(NOT xrceagent_FOUND)
5162
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
5263
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
5364
)
65+
list(APPEND _deps microxrcedds_agent)
5466
endif()
5567

5668
# Main project.
@@ -64,5 +76,5 @@ ExternalProject_Add(micro_ros_agent
6476
INSTALL_COMMAND
6577
""
6678
DEPENDS
67-
xrceagent
79+
${_deps}
6880
)

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)