Skip to content
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

Jump to bottom

Add mechanism to disable workaround for dependency groups #3

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Add mechanism to disable workaround for dependency groups #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions rosidl_core_generators/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,17 @@

<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
<buildtool_export_depend>rosidl_cmake</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_generator_packages -->
<buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_generator_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_generator_py</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_c_packages -->
<buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_fastrtps_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_introspection_c</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_cpp_packages -->
<buildtool_export_depend>rosidl_typesupport_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_fastrtps_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_introspection_cpp</buildtool_export_depend>

<!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_cpp</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_py</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_cpp</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_cpp</buildtool_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
24 changes: 10 additions & 14 deletions rosidl_core_runtime/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,16 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_runtime_packages -->
<build_export_depend>rosidl_runtime_c</build_export_depend>
<build_export_depend>rosidl_runtime_cpp</build_export_depend>
<build_export_depend>rosidl_generator_py</build_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_c_packages -->
<build_export_depend>rosidl_typesupport_c</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_c</build_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_cpp_packages -->
<build_export_depend>rosidl_typesupport_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>
<!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_py</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_runtime_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_runtime_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_cpp</build_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down