Use CMAKE_STAGING_PREFIX for staging OGRE installation #861
Conversation
This file contains 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
To maintain build/install phasing correctly, this vendor package is installing the external project to a staging location, which is then recursively copied to the final location during the vendor package's installation phase. The mechanism by which we're currently telling the external project where to install to gives it the impression that that will be the final destination, and it embeds such paths in places like pkgconfig files. The CMAKE_STAGING_PREFIX can be used to override all of the `install()` operations' targets while still telling the project where it will eventually end up, which is pretty much exactly what we're trying to do. Signed-off-by: Scott K Logan <logans@cottsay.net>
cottsay
commented
May 10, 2022
Comment on lines
-204
to
+205
| ${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor | ||
| opt/rviz_ogre_vendor |
There was a problem hiding this comment.
This part of the change is actually intended to accomplish the (sort of) opposite - to support CMAKE_STAGING_PREFIX during build of the vendor package itself. That isn't something we're currently trying to do, but it seems appropriate to not needlessly exclude that scenario given that we're relying on it functioning correctly here.
sloretz
approved these changes
Jun 10, 2022
There was a problem hiding this comment.
LGTM with green CI
Since the docs said it was for cross-compiling I initially wondered if CMAKE_STAGING_PREFIX would only do something if CMAKE_CROSSCOMPILING was set, but looking at the commit that added it it appears to always do something.
I built and ran RViz2 locally. I no longer see build directory paths in the pkg-config files.
jacobperron
approved these changes
Jun 10, 2022
|
@Mergifyio backport humble |
mergify bot
pushed a commit
that referenced
this pull request
Jun 10, 2022
To maintain build/install phasing correctly, this vendor package is installing the external project to a staging location, which is then recursively copied to the final location during the vendor package's installation phase. The mechanism by which we're currently telling the external project where to install to gives it the impression that that will be the final destination, and it embeds such paths in places like pkgconfig files. The CMAKE_STAGING_PREFIX can be used to override all of the `install()` operations' targets while still telling the project where it will eventually end up, which is pretty much exactly what we're trying to do. Signed-off-by: Scott K Logan <logans@cottsay.net> (cherry picked from commit 47e91ee)
✅ Backports have been created
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To maintain build/install phasing correctly, this vendor package is installing the external project to a staging location, which is then
recursively copied to the final location during the vendor package's installation phase.
The mechanism by which we're currently telling the external project where to install to gives it the impression that that will be the final destination, and it embeds such paths in places like pkgconfig files.
The CMAKE_STAGING_PREFIX can be used to override all of the
install()operations' targets while still telling the project where it will eventually end up, which is pretty much exactly what we're trying to do.We should consider making this change in other vendor packages, but I'm trying it here first because the
*.pcfiles it installs contain paths to thebuilddirectory and are currently useless (at best).