Undo changes in micro-ros agent compilation (#239) · micro-ROS/micro-ROS-Agent@9146124 · GitHub

micro-ROS / micro-ROS-Agent Public

• Notifications You must be signed in to change notification settings
• Fork 111
• Star 201

• Code
• Issues 39
• Pull requests 6
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 9146124

Browse filesBrowse the repository at this point in the historyBrowse files

rsanchez15

authored

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 beac621 commit 9146124
Copy full SHA for 9146124

3 files changed

+5-6Lines changed: 5 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• micro_ros_agent
  • CMakeLists.txt
  • cmake
    • SuperBuild.cmake
  • package.xml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎micro_ros_agent/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: micro_ros_agent/CMakeLists.txt

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -31,10 +31,10 @@ else()
31	31	endif()
32	32
33	33	find_package(ament_cmake REQUIRED)
	34	+ find_package(microxrcedds_agent REQUIRED)
34	35	find_package(rosidl_cmake REQUIRED)
35	36	find_package(fastcdr REQUIRED)
36	37	find_package(fastdds REQUIRED)
37		- find_package(microxrcedds_agent REQUIRED)
38	38	find_package(fastrtps_cmake_module REQUIRED)
39	39	find_package(rmw_dds_common REQUIRED)
40	40	find_package(rmw REQUIRED)

Collapse file

‎micro_ros_agent/cmake/SuperBuild.cmake‎

Copy file name to clipboardExpand all lines: micro_ros_agent/cmake/SuperBuild.cmake

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -19,10 +19,10 @@ unset(_deps)
19	19	enable_language(C)
20	20	enable_language(CXX)
21	21
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)
24	24	if(NOT xrceagent_FOUND)
25		- ExternalProject_Add(microxrcedds_agent
	25	+ ExternalProject_Add(xrceagent
26	26	GIT_REPOSITORY
27	27	https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
28	28	GIT_TAG
@@ -64,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
64	64	INSTALL_COMMAND
65	65	""
66	66	DEPENDS
67		- microxrcedds_agent
	67	+ xrceagent
68	68	)

Collapse file

‎micro_ros_agent/package.xml‎

Copy file name to clipboardExpand all lines: micro_ros_agent/package.xml

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -20,7 +20,6 @@
20	20	<depend>rmw_fastrtps_shared_cpp</depend>
21	21	<depend>rmw_dds_common</depend>
22	22	<depend>micro_ros_msgs</depend>
23		- <depend>microxrcedds_agent</depend>
24	23
25	24	<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
26	25	<test_depend>ament_cmake_gtest</test_depend>

0 commit comments

Comments

0 (0)