mirror of
https://github.com/micro-ROS/micro-ROS-Agent.git
synced 2026-09-06 09:55:15 +02:00
* Fix 'microxrcedds_agent' name and dependency (#279)
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
(cherry picked from commit 5e42d6ab6f)
* Fix conflicts
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
---------
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
Co-authored-by: David Laseca Perez <davidlaseca@eprosima.com>
This commit is contained in:
co-authored by
David Laseca Perez
parent
6df7af90c8
commit
c7a4ea6758
@@ -19,10 +19,10 @@ unset(_deps)
|
|||||||
enable_language(C)
|
enable_language(C)
|
||||||
enable_language(CXX)
|
enable_language(CXX)
|
||||||
|
|
||||||
unset(xrceagent_DIR CACHE)
|
unset(microxrcedds_agent_DIR CACHE)
|
||||||
find_package(xrceagent 2 EXACT QUIET)
|
find_package(microxrcedds_agent 2 QUIET)
|
||||||
if(NOT xrceagent_FOUND)
|
if(NOT microxrcedds_agent_FOUND)
|
||||||
ExternalProject_Add(xrceagent
|
ExternalProject_Add(microxrcedds_agent
|
||||||
GIT_REPOSITORY
|
GIT_REPOSITORY
|
||||||
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
|
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
|
||||||
GIT_TAG
|
GIT_TAG
|
||||||
@@ -51,6 +51,7 @@ if(NOT xrceagent_FOUND)
|
|||||||
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
|
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
|
||||||
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
|
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
|
||||||
)
|
)
|
||||||
|
list(APPEND _deps microxrcedds_agent)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Main project.
|
# Main project.
|
||||||
@@ -64,5 +65,5 @@ ExternalProject_Add(micro_ros_agent
|
|||||||
INSTALL_COMMAND
|
INSTALL_COMMAND
|
||||||
""
|
""
|
||||||
DEPENDS
|
DEPENDS
|
||||||
xrceagent
|
${_deps}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
<depend>rmw_fastrtps_shared_cpp</depend>
|
<depend>rmw_fastrtps_shared_cpp</depend>
|
||||||
<depend>rmw_dds_common</depend>
|
<depend>rmw_dds_common</depend>
|
||||||
<depend>micro_ros_msgs</depend>
|
<depend>micro_ros_msgs</depend>
|
||||||
|
<depend>microxrcedds_agent</depend>
|
||||||
|
|
||||||
<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
|
<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
|
||||||
<test_depend>ament_cmake_gtest</test_depend>
|
<test_depend>ament_cmake_gtest</test_depend>
|
||||||
|
|||||||
Reference in New Issue
Block a user