Skip to content

Use target_link_libraries instead of ament_target_dependencies #61

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

Merged
4ntn merged 3 commits into from
May 22, 2025
Merged

Use target_link_libraries instead of ament_target_dependencies #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8358e62
Bump CI versions
4ntn May 20, 2025
50a8bcf
Use target_link_libraries instead of ament_target_dependencies
4ntn May 20, 2025
e3d0f33
Fix library names
4ntn May 21, 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
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
pull_request:
branches:
- '**'
workflow_dispatch:
inputs:
name:
description: "Manual trigger"

jobs:
build:
Expand All @@ -12,16 +16,16 @@ jobs:
fail-fast: false
matrix:
include:
- docker_image: ubuntu:jammy
- docker_image: ubuntu:24.04
ros_distribution: rolling
container:
image: ${{ matrix.docker_image }}
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.2
- uses: ros-tooling/setup-ros@0.7.7
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
- uses : ros-tooling/action-ros-ci@0.3.2
- uses : ros-tooling/action-ros-ci@0.3.13
with:
package-name: "micro_ros_utilities"
target-ros2-distro: ${{ matrix.ros_distribution }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
include:
- docker_image: ubuntu:jammy
- docker_image: ubuntu:24.04
ros_distribution: rolling
- docker_image: ubuntu:jammy
ros_distribution: iron
Expand Down
22 changes: 11 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ target_include_directories(${PROJECT_NAME}
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
)

ament_target_dependencies(${PROJECT_NAME}
rosidl_typesupport_introspection_c
rosidl_runtime_c
rcutils
target_link_libraries(${PROJECT_NAME}
rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c
rosidl_runtime_c::rosidl_runtime_c
rcutils::rcutils
)

#################################################
Expand Down Expand Up @@ -75,13 +75,13 @@ if(BUILD_TESTING)

target_include_directories(${PROJECT_NAME}_test PRIVATE include src)
target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME})
ament_target_dependencies(${PROJECT_NAME}_test
rosidl_typesupport_introspection_c
rosidl_generator_c
rosidl_runtime_c
rcutils
std_msgs
trajectory_msgs
target_link_libraries(${PROJECT_NAME}_test
rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c
${rosidl_generator_c_LIBRARIES}
rosidl_runtime_c::rosidl_runtime_c
rcutils::rcutils
${std_msgs_TARGETS}
${trajectory_msgs_TARGETS}
)
endif()

Expand Down