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

Migrate some security-related changes from iron to humble #1238

Merged
merged 2 commits into from
Jul 15, 2024

Conversation

xueying4402
Copy link

This Pull Request includes the following changes:

  1. commit c23995 Remove broken rviz_ogre_vendor::RenderSystem_GL target Remove broken rviz_ogre_vendor::RenderSystem_GL target #920
  2. commit 2c2a46
    If vendored assimp is present, always prefer that If vendored assimp is present, always prefer that #970

sloretz and others added 2 commits July 13, 2024 10:12
Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
The existing behavior is to always prefer the system's assimp package if
it is sufficient, even if the vendored assimp package is present. This
is very confusing behavior when combined with FORCE_BUILD_VENDOR_PKG.

Additionally, the double find_package calls can result in strange
behavior if both calls deal create or modify targets, as targets created
by the first call will be present when the second call tries to create
them.

Signed-off-by: Scott K Logan <logans@cottsay.net>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

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

@ahcorde ahcorde merged commit 3d472c3 into ros2:humble Jul 15, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants