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.

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

avoid recursive find #44

Merged
merged 1 commit into from
Jul 17, 2018
Merged

avoid recursive find #44

merged 1 commit into from
Jul 17, 2018

Conversation

dirk-thomas
Copy link
Member

@dirk-thomas dirk-thomas commented Jul 16, 2018

In the case where selected_rmw_implementation is rmw_implementation it shouldn't call find_package for it since the entire logic already happens in the CMake config file of rmw_implementation so it is already "inside" a find_package(rmw_implementation) call.

This only doesn't end in an infinite recursion due to the custom logic in the generated CMake config files which returns early from repeated finds: https://github.com/ament/ament_cmake/blob/6d171d79584319c216e6880c46372224cd3ae6eb/ament_cmake_core/cmake/core/templates/nameConfig.cmake.in#L3-L7

Connect to ros2/ros2#544.

@dirk-thomas dirk-thomas added bug Something isn't working in review Waiting for review (Kanban column) labels Jul 16, 2018
@dirk-thomas dirk-thomas self-assigned this Jul 16, 2018
@dirk-thomas
Copy link
Member Author

dirk-thomas commented Jul 16, 2018

CI with 2 RMWs:

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

CI with 1 RMW:

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

@dirk-thomas
Copy link
Member Author

While this commit (ament/ament_cmake@8003349) was added after CI was triggered the results still hold. Obviously there were no FATAL_ERRORs in the builds so the change is only relevant for overlay builds.

Copy link
Member

@mikaelarguedas mikaelarguedas left a comment

Choose a reason for hiding this comment

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

lgtm

@dirk-thomas dirk-thomas merged commit 2115780 into master Jul 17, 2018
@dirk-thomas dirk-thomas deleted the avoid_recursive_find branch July 17, 2018 21:50
@dirk-thomas dirk-thomas removed the in review Waiting for review (Kanban column) label Jul 17, 2018
@mikaelarguedas mikaelarguedas mentioned this pull request Jul 17, 2018
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants