Skip to content

Install includes to include/${PROJECT_NAME}#548

Merged
sloretz merged 2 commits intomasterfrom
sloretz__easy_idso_part1
Jan 20, 2022
Merged

Install includes to include/${PROJECT_NAME}#548
sloretz merged 2 commits intomasterfrom
sloretz__easy_idso_part1

Conversation

@sloretz
Copy link
Copy Markdown
Contributor

@sloretz sloretz commented Jan 5, 2022 •
edited
Loading

Part of ros2/ros2#1150

This installs includes to include/${PROJECT_NAME} to mitigate include directory search order issues when overriding packages in desktop.

Part of ament/ament_cmake#365

This removes ament_export_libraries and ament_export_include_directories as they're redundant with the exported CMake targets. Edit: Added back old-style CMake variables to minimize disruption

Part of ament/ament_cmake#292

This replaces ament_target_dependencies() calls with target_link_libraries().

Requires ros2/rclcpp#1855 for the rclcpp_components::component target.

@sloretz sloretz self-assigned this Jan 5, 2022
@sloretz sloretz mentioned this pull request Jan 5, 2022
Merged
@sloretz sloretz marked this pull request as ready for review January 11, 2022 19:07
sloretz and others added 2 commits January 19, 2022 16:43
@sloretz
Install includes to include/${PROJECT_NAME}
9a743b8 
Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz
Add back old-style CMake variables
ff42087 
Signed-off-by: Shane Loretz <sloretz@openrobotics.org>
@sloretz sloretz force-pushed the sloretz__easy_idso_part1 branch from a759fab to ff42087 Compare January 20, 2022 00:58
clalancette
clalancette approved these changes Jan 20, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks generally good to me. The Rpr job should be fixed when ros-visualization/rqt_image_view#62 is released.

@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Jan 20, 2022

CI

  • repos file
  • build: --packages-up-to action_tutorials_cpp action_tutorials_interfaces action_tutorials_py composition demo_nodes_cpp demo_nodes_cpp_native demo_nodes_py dummy_map_server dummy_robot_bringup dummy_sensors image_tools intra_process_demo lifecycle lifecycle_py logging_demo pendulum_control pendulum_msgs quality_of_service_demo_cpp quality_of_service_demo_py topic_monitor topic_statistics_demo
  • test: --packages-select action_tutorials_cpp action_tutorials_interfaces action_tutorials_py composition demo_nodes_cpp demo_nodes_cpp_native demo_nodes_py dummy_map_server dummy_robot_bringup dummy_sensors image_tools intra_process_demo lifecycle lifecycle_py logging_demo pendulum_control pendulum_msgs quality_of_service_demo_cpp quality_of_service_demo_py topic_monitor topic_statistics_demo)

Jobs

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@sloretz sloretz merged commit d703434 into master Jan 20, 2022
@delete-merged-branch delete-merged-branch bot deleted the sloretz__easy_idso_part1 branch January 20, 2022 19:37
@Blast545
Copy link
Copy Markdown

Blast545 commented Jan 21, 2022

👨‍🌾 It seems this PR caused a build regression in the windows_packaging jobs:
https://ci.ros2.org/view/packaging/job/packaging_windows/2367/

Can you please take a look @sloretz ? 🙏

@ivanpauno
Copy link
Copy Markdown
Member

ivanpauno commented Jan 21, 2022

The Rpr checker was not passing when this was merged and it's still not passing (e.g. #552).
It seems that there has already been a rclcpp rolling release after that, which included ros2/rclcpp#1855 (https://github.com/ros2/rclcpp/commits/15.0.0).
The rosdistro PR was merged 7 days ago, so I guess a sync in the testing repo has already happened.

@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Jan 21, 2022

I guess a sync in the testing repo has already happened.

@ivanpauno A sync to testing has not happened: http://repo.ros2.org/status_page/rolling_default.html?q=ros-rolling-rclcpp . Building has rclcpp 15.0.0, but testing still has 14.1.0. The PR job will pass when the sync to testing happens.

@sloretz sloretz mentioned this pull request Jan 21, 2022
Merged
@ivanpauno
Copy link
Copy Markdown
Member

ivanpauno commented Jan 21, 2022

@ivanpauno A sync to testing has not happened: http://repo.ros2.org/status_page/rolling_default.html?q=ros-rolling-rclcpp . Building has rclcpp 15.0.0, but testing still has 14.1.0. The PR job will pass when the sync to testing happens.

Thanks for the link! I didn't know how to check that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@clalancette clalancette clalancette approved these changes

Assignees

@sloretz sloretz

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sloretz @Blast545 @ivanpauno @clalancette