mirror of
https://github.com/micro-ROS/micro-ROS-Agent.git
synced 2026-09-06 09:55:15 +02:00
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>
This commit is contained in:
committed by
Pablo Garrido
parent
a939d1d407
commit
96a24c0fa7
@@ -31,10 +31,10 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(ament_cmake REQUIRED)
|
find_package(ament_cmake REQUIRED)
|
||||||
|
find_package(microxrcedds_agent REQUIRED)
|
||||||
find_package(rosidl_cmake REQUIRED)
|
find_package(rosidl_cmake REQUIRED)
|
||||||
find_package(fastcdr REQUIRED)
|
find_package(fastcdr REQUIRED)
|
||||||
find_package(fastdds REQUIRED)
|
find_package(fastdds REQUIRED)
|
||||||
find_package(microxrcedds_agent REQUIRED)
|
|
||||||
find_package(fastrtps_cmake_module REQUIRED)
|
find_package(fastrtps_cmake_module REQUIRED)
|
||||||
find_package(rmw_dds_common REQUIRED)
|
find_package(rmw_dds_common REQUIRED)
|
||||||
find_package(rmw REQUIRED)
|
find_package(rmw REQUIRED)
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ unset(_deps)
|
|||||||
enable_language(C)
|
enable_language(C)
|
||||||
enable_language(CXX)
|
enable_language(CXX)
|
||||||
|
|
||||||
unset(microxrcedds_agent_DIR CACHE)
|
unset(xrceagent_DIR CACHE)
|
||||||
find_package(microxrcedds_agent 3 EXACT QUIET)
|
find_package(xrceagent 3 EXACT QUIET)
|
||||||
if(NOT xrceagent_FOUND)
|
if(NOT xrceagent_FOUND)
|
||||||
ExternalProject_Add(microxrcedds_agent
|
ExternalProject_Add(xrceagent
|
||||||
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
|
||||||
@@ -64,5 +64,5 @@ ExternalProject_Add(micro_ros_agent
|
|||||||
INSTALL_COMMAND
|
INSTALL_COMMAND
|
||||||
""
|
""
|
||||||
DEPENDS
|
DEPENDS
|
||||||
microxrcedds_agent
|
xrceagent
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
<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