Skip to content

Supporting Jazzy distribution #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Supporting Jazzy distribution #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
242cdb7
Add jazzy message repos
f0reachARR Dec 20, 2024
1a6467f
Use rosidl_cmake_VERSION to determine which function to use
f0reachARR Dec 20, 2024
16a6432
Add jazzy for rmw check
f0reachARR Dec 20, 2024
63f0870
Fix yaml-cpp errors
f0reachARR Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions ros2_jazzy.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
repositories:
ros2/rosidl_defaults:
type: git
url: https://github.com/ros2/rosidl_defaults.git
version: jazzy
ros2/rosidl_core:
type: git
url: https://github.com/ros2/rosidl_core.git
version: jazzy
ros2/common_interfaces:
type: git
url: https://github.com/ros2/common_interfaces.git
version: jazzy
ros2/example_interfaces:
type: git
url: https://github.com/ros2/example_interfaces.git
version: jazzy
ros2/unique_identifier_msgs:
type: git
url: https://github.com/ros2/unique_identifier_msgs.git
version: jazzy
ros2/rcl_interfaces:
type: git
url: https://github.com/ros2/rcl_interfaces.git
version: jazzy
ros2/geometry2:
type: git
url: https://github.com/ros2/geometry2.git
version: jazzy
ros2/test_interface_files:
type: git
url: https://github.com/ros2/test_interface_files.git
version: jazzy
external/build_tools/dotnet_cmake_module:
type: git
url: https://github.com/RobotecAI/dotnet_cmake_module
version: 1.1.0
external/build_tools/ament_cmake_export_assemblies:
type: git
url: https://github.com/RobotecAI/ament_cmake_export_assemblies
version: master
4 changes: 2 additions & 2 deletions src/ros2cs/ros2cs_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ if(STANDALONE_BUILD)
endif()

# Get rmw_cyclonedds_cpp for humble
if("${_library_name}" STREQUAL "rmw_cyclonedds_cpp" AND (ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling"))
if("${_library_name}" STREQUAL "rmw_cyclonedds_cpp" AND (ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "jazzy" OR ros2_distro STREQUAL "rolling"))
fetch_target_lib(rmw_cyclonedds_cpp::rmw_cyclonedds_cpp)
list(APPEND REQ_STANDALONE_LIBS ${rmw_cyclonedds_cpp_rmw_cyclonedds_cpp_LIB_PATH})
endif()
Expand Down Expand Up @@ -377,7 +377,7 @@ if(STANDALONE_BUILD)
rosidl_typesupport_introspection_cpp
spdlog
tracetools
yaml
yaml-cpp
tinyxml2
)

Expand Down
4 changes: 2 additions & 2 deletions src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ foreach(_generated_msg_c_ts_file ${_generated_msg_c_ts_files})

set(ros2_distro "$ENV{ROS_DISTRO}")

if(ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling")
if(${rosidl_cmake_VERSION} VERSION_GREATER 2.5.0)
rosidl_get_typesupport_target(c_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_c")
target_link_libraries(${_target_name} "${c_typesupport_target}")
else()
Expand Down Expand Up @@ -352,7 +352,7 @@ foreach(_generated_srv_c_ts_file ${_generated_srv_c_ts_files})

set(ros2_distro "$ENV{ROS_DISTRO}")

if(ros2_distro STREQUAL "humble" OR ros2_distro STREQUAL "rolling")
if(${rosidl_cmake_VERSION} VERSION_GREATER 2.5.0)
rosidl_get_typesupport_target(c_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_c")
target_link_libraries(${_target_name} "${c_typesupport_target}")
else()
Expand Down