Skip to content

Commit 4310df3

Browse files
authored
Revert "Fix 'microxrcedds_agent' name and dependency (#279) (#280)" (#283)
This reverts commit d2d97bc.
1 parent d2d97bc commit 4310df3

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

micro_ros_agent/cmake/SuperBuild.cmake

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

5756
# Main project.
@@ -65,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
6564
INSTALL_COMMAND
6665
""
6766
DEPENDS
68-
${_deps}
67+
xrceagent
6968
)

micro_ros_agent/package.xml

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

2524
<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
2625
<test_depend>ament_cmake_gtest</test_depend>

0 commit comments

Comments
 (0)