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

Patch the pkg-config directory in the gz-cmake code. #4

Merged

Conversation

clalancette
Copy link
Contributor

When building on the ROS 2 buildfarm, we aren't setting some of the CMAKE_PREFIX variables. This means that using CMAKE_INSTALL_FULL_LIBDIR actually creates a path like /opt/ros/rolling/... , which makes debuild upset.

However, we actually need the FULL_LIBDIR in order to calculate the relative path between it and the INSTALL_PREFIX. Work around this by having two variables; the
pkgconfig_install_dir (relative), used to install the files, and pkgconfig_abs_install_dir (absolute), used to calculate the relative path between them.

This should fix the build on the buildfarm. I'll note that we are doing it here and not in gz-cmake proper because of knock-on effects to downstream gazebo. If this is successful we may end up merging it there, at which point we can drop this patch.

When building on the ROS 2 buildfarm, we aren't setting
some of the CMAKE_PREFIX variables.  This means that
using CMAKE_INSTALL_FULL_LIBDIR actually creates a path
like /opt/ros/rolling/... , which makes debuild upset.

However, we actually need the FULL_LIBDIR in order to
calculate the relative path between it and the INSTALL_PREFIX.
Work around this by having two variables; the
pkgconfig_install_dir (relative), used to install the files,
and pkgconfig_abs_install_dir (absolute), used to calculate
the relative path between them.

This should fix the build on the buildfarm.  I'll note that
we are doing it here and not in gz-cmake proper because of
knock-on effects to downstream gazebo.  If this is successful
we may end up merging it there, at which point we can drop
this patch.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Copy link
Collaborator

@azeey azeey left a comment

Choose a reason for hiding this comment

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

Thanks!

@azeey azeey merged commit 22c07a5 into gazebo-release:rolling Mar 28, 2024
@clalancette clalancette deleted the clalancette/fixes-for-packaging branch March 28, 2024 18:35
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.

2 participants