Skip to content

Commit 96a24c0

Browse files
rsanchez15pablogs9
authored andcommitted
Undo changes in micro-ros agent compilation (#239)
* Remove microxrcedds_agent ros dependency Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Bring old xrceanget name back for superbuild Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>
1 parent a939d1d commit 96a24c0

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

micro_ros_agent/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ else()
3131
endif()
3232

3333
find_package(ament_cmake REQUIRED)
34+
find_package(microxrcedds_agent REQUIRED)
3435
find_package(rosidl_cmake REQUIRED)
3536
find_package(fastcdr REQUIRED)
3637
find_package(fastdds REQUIRED)
37-
find_package(microxrcedds_agent REQUIRED)
3838
find_package(fastrtps_cmake_module REQUIRED)
3939
find_package(rmw_dds_common REQUIRED)
4040
find_package(rmw REQUIRED)

micro_ros_agent/cmake/SuperBuild.cmake

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

22-
unset(microxrcedds_agent_DIR CACHE)
23-
find_package(microxrcedds_agent 3 EXACT QUIET)
22+
unset(xrceagent_DIR CACHE)
23+
find_package(xrceagent 3 EXACT QUIET)
2424
if(NOT xrceagent_FOUND)
25-
ExternalProject_Add(microxrcedds_agent
25+
ExternalProject_Add(xrceagent
2626
GIT_REPOSITORY
2727
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
2828
GIT_TAG
@@ -64,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
6464
INSTALL_COMMAND
6565
""
6666
DEPENDS
67-
microxrcedds_agent
67+
xrceagent
6868
)

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)