ogre2: retain CMAKE_INSTALL_RPATH values #909
Merged
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
Sets the ogre2 target INSTALL_RPATH to a copy of CMAKE_INSTALL_RPATH with OGRE_LIBRARY_DIRS appended, instead of just the latter path. This helps with packaging on macOS. Signed-off-by: Steve Peters <[email protected]>
Codecov Report
@@ Coverage Diff @@
## gz-rendering8 #909 +/- ##
==============================================
Coverage 75.18% 75.18%
==============================================
Files 177 177
Lines 16846 16846
==============================================
Hits 12665 12665
Misses 4181 4181 |
mjcarroll
approved these changes
Sep 15, 2023
|
macOS CI failed and I was looking into it |
|
Ah, sorry! |
mjcarroll
added a commit
that referenced
this pull request
Sep 15, 2023
This reverts commit 8c1fd27.
|
no worries; I think it may have been preexisting; I'm reviewing previous build failures |
|
looks like it came from #897 |
scpeters
added a commit
that referenced
this pull request
Sep 15, 2023
Sets the ogre2 target INSTALL_RPATH to a copy of CMAKE_INSTALL_RPATH with OGRE_LIBRARY_DIRS appended, instead of just the latter path. This helps with packaging on macOS. Signed-off-by: Steve Peters <[email protected]>
8 tasks
scpeters
added a commit
that referenced
this pull request
Sep 18, 2023
Sets the ogre2 target INSTALL_RPATH to a copy of CMAKE_INSTALL_RPATH with OGRE_LIBRARY_DIRS appended, instead of just the latter path. This helps with packaging on macOS. Signed-off-by: Steve Peters <[email protected]>
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.
🦟 Bug fix
Related to osrf/homebrew-simulation#2273
Summary
I have been adding some RPATH configuration to our homebrew formulae to fix issues with binaries installed to subfolders of
libandlibexecon ARM processors, for which homebrew is installed to/opt/homebrewinstead of/usr/local. In osrf/homebrew-simulation#2404 for example, an additional entry is added toCMAKE_INSTALL_RPATHto fix agz-pluginstandalone executable. TheCMAKE_INSTALL_RPATHvalue provides a default value for theINSTALL_RPATHproperty of all targets. While testing these rpath fixes, but I ran into a problem with just the ogre2 library in gz-rendering not using the paths specified inCMAKE_INSTALL_RPATH. After looking at the gz-rendering source code, I see that theINSTALL_RPATHof the ogre2 target is set to a single path, which overrides the default values fromCMAKE_INSTALL_RPATH.This pull request sets the ogre2 target
INSTALL_RPATHproperty to a copy ofCMAKE_INSTALL_RPATHwithOGRE_LIBRARY_DIRSappended, instead of just the latter path. This helps with packaging on macOS.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.