FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix 'microxrcedds_agent' name and dependency by David-LP99 · Pull Request #279 · micro-ROS/micro-ROS-Agent · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .cmake  (1) .xml  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
13 changes: 7 additions & 6 deletions micro_ros_agent/cmake/SuperBuild.cmake
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ unset(_deps)
enable_language(C)
enable_language(CXX)

unset(xrceagent_DIR CACHE)
find_package(xrceagent 3 EXACT QUIET)
if(NOT xrceagent_FOUND)
ExternalProject_Add(xrceagent
unset(microxrcedds_agent_DIR CACHE)
find_package(microxrcedds_agent 3.0.2 QUIET)
if(NOT microxrcedds_agent_FOUND)
ExternalProject_Add(microxrcedds_agent
GIT_REPOSITORY
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
GIT_TAG
v3.0.1
v3.0.2
PREFIX
${PROJECT_BINARY_DIR}/agent
INSTALL_DIR
Expand All @@ -51,6 +51,7 @@ if(NOT xrceagent_FOUND)
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
)
list(APPEND _deps microxrcedds_agent)
endif()

# Main project.
Expand All @@ -64,5 +65,5 @@ ExternalProject_Add(micro_ros_agent
INSTALL_COMMAND
""
DEPENDS
xrceagent
${_deps}
)
1 change: 1 addition & 0 deletions micro_ros_agent/package.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<depend>rmw_fastrtps_shared_cpp</depend>
<depend>rmw_dds_common</depend>
<depend>micro_ros_msgs</depend>
<depend>microxrcedds_agent</depend>

<test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
<test_depend>ament_cmake_gtest</test_depend>
Expand Down
Loading

Back | FazBrowse Home | New Git URL