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

Backport #909: rpath fix for garden #912

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Backport #909 to garden

Summary

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.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Rebase-and-Merge

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]>
@scpeters scpeters requested a review from iche033 as a code owner September 15, 2023 20:22
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Sep 15, 2023
@codecov
Copy link

codecov bot commented Sep 15, 2023

Codecov Report

Merging #912 (541faad) into gz-rendering7 (59417ba) will not change coverage.
The diff coverage is n/a.

❗ Current head 541faad differs from pull request most recent head 89b30a0. Consider uploading reports for the commit 89b30a0 to get more accurate results

@@              Coverage Diff               @@
##           gz-rendering7     #912   +/-   ##
==============================================
  Coverage          77.22%   77.22%           
==============================================
  Files                170      170           
  Lines              14721    14721           
==============================================
  Hits               11369    11369           
  Misses              3352     3352           

@scpeters
Copy link
Member Author

windows failures seem to be described by #745 and look unrelated to this PR. I'll go ahead and merge

@scpeters scpeters merged commit da675f6 into gz-rendering7 Sep 18, 2023
9 checks passed
@scpeters scpeters deleted the scpeters/pick_rpath_7 branch September 18, 2023 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants