Revert "Fix 'microxrcedds_agent' name and dependency (#279) (#280)" (… · micro-ROS/micro-ROS-Agent@4310df3 · 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 4310df3

Browse filesBrowse the repository at this point in the historyBrowse files

rsanchez15

authored

Revert "Fix 'microxrcedds_agent' name and dependency (#279) (#280)" (#283)

This reverts commit d2d97bc.

1 parent d2d97bc commit 4310df3
Copy full SHA for 4310df3

2 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• micro_ros_agent
  • cmake
    • SuperBuild.cmake
  • package.xml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎micro_ros_agent/cmake/SuperBuild.cmake‎

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

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

Original file line number	Diff line number	Diff line change
@@ -19,14 +19,14 @@ 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.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
26	26	GIT_REPOSITORY
27	27	https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
28	28	GIT_TAG
29		- v3.0.2
	29	+ v3.0.1
30	30	PREFIX
31	31	${PROJECT_BINARY_DIR}/agent
32	32	INSTALL_DIR
@@ -51,7 +51,6 @@ if(NOT microxrcedds_agent_FOUND)
51	51	-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
52	52	-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
53	53	)
54		- list(APPEND _deps microxrcedds_agent)
55	54	endif()
56	55
57	56	# Main project.
@@ -65,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
65	64	INSTALL_COMMAND
66	65	""
67	66	DEPENDS
68		- ${_deps}
	67	+ xrceagent
69	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)