Compute relative path for cmake extras#362
Merged
Conversation
This is needed by a subsequent step that depends on variables defined by GNUInstallDirs. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Define a variable in gz_configure_project with the relative path from the extras install folder to the install prefix. This is needed by downstream packages. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Contributor
|
Testing the change |
mjcarroll
approved these changes
Jul 6, 2023
Contributor
mjcarroll
left a comment
mjcarroll
left a comment
There was a problem hiding this comment.
Good catch! Changes make sense to me, and looks good with green CI.
Member
Author
|
Member
Author
|
I'd like to merge this and then make a nightly build of gz-cmake3 to continue testing before making a patch release with this change |
Contributor
Sounds good to me. |
Contributor
Dah, need more coffee, sorry. |
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🦟 Bug fix
Needed by gazebosim/gz-transport#398, follow-up to #360 and gazebosim/gz-msgs#339 (comment)
Summary
As noted in gazebosim/gz-msgs#339 (comment), packages that install extra cmake files may need the relative path from the folder to which the extra cmake files are installed and the install prefix. In order to account for arch-specific lib folders (needed for debian installs to
/usr, see GNUInstallDirs), some code is rearranged so that the relative path is computed after the_gz_setup_packages()macro, since that is whereGNUInstallDirsis included from, and before the extra cmake files are configured.Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.