From 242cdb7403215fe3bdc3dc4aa7b6985278b86771 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Fri, 20 Dec 2024 12:04:03 +0900 Subject: [PATCH 1/4] Add jazzy message repos --- ros2_jazzy.repos | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ros2_jazzy.repos diff --git a/ros2_jazzy.repos b/ros2_jazzy.repos new file mode 100644 index 00000000..2e5d1329 --- /dev/null +++ b/ros2_jazzy.repos @@ -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 From 1a6467facf57608fedd0c5a36ef72078e25ff056 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Fri, 20 Dec 2024 12:04:33 +0900 Subject: [PATCH 2/4] Use rosidl_cmake_VERSION to determine which function to use --- .../cmake/rosidl_generator_cs_generate_interfaces.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake b/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake index b263cb8c..09eb1a39 100644 --- a/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake +++ b/src/ros2cs/rosidl_generator_cs/cmake/rosidl_generator_cs_generate_interfaces.cmake @@ -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() @@ -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() From 16a6432b9135405f837513da00942ca87d0b4907 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Fri, 20 Dec 2024 12:05:17 +0900 Subject: [PATCH 3/4] Add jazzy for rmw check --- src/ros2cs/ros2cs_core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ros2cs/ros2cs_core/CMakeLists.txt b/src/ros2cs/ros2cs_core/CMakeLists.txt index d5f2955a..a4a0c608 100644 --- a/src/ros2cs/ros2cs_core/CMakeLists.txt +++ b/src/ros2cs/ros2cs_core/CMakeLists.txt @@ -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() From 63f0870b6577678bc10a567d9173e8b6168a4799 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 9 Jan 2025 12:34:53 +0900 Subject: [PATCH 4/4] Fix yaml-cpp errors --- src/ros2cs/ros2cs_core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ros2cs/ros2cs_core/CMakeLists.txt b/src/ros2cs/ros2cs_core/CMakeLists.txt index a4a0c608..2b8c0563 100644 --- a/src/ros2cs/ros2cs_core/CMakeLists.txt +++ b/src/ros2cs/ros2cs_core/CMakeLists.txt @@ -377,7 +377,7 @@ if(STANDALONE_BUILD) rosidl_typesupport_introspection_cpp spdlog tracetools - yaml + yaml-cpp tinyxml2 )