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.

Sign up for GitHub

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

Jump to bottom

Backport #419: Ensure relocatable config files #1093

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Backport #419: Ensure relocatable config files #1093

merged 1 commit into from
Jul 27, 2022

Conversation

scpeters
Copy link
Member

Backport #419 to sdf9: Ensure relocatable config files

Use Rebase-and-Merge.

@Pro @scpeters @j-rivero
Ensure relocatable config files (#419)
d10bbda 
* fix: Use PACKAGE_PREFIX_DIR to ensure relocatable CMake install for conan

Signed-off-by: Stefan Profanter <stefan.profanter@agile-robots.com>

* Compute relative path for pkgconfig folder.
  This accounts for arch-dependent lib folders.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@scpeters scpeters requested a review from azeey as a code owner July 27, 2022 19:36
@github-actions github-actions bot added Gazebo 1️1️ Dependency of Gazebo classic version 11 🏰 citadel Ignition Citadel labels Jul 27, 2022
@codecov
Copy link

codecov bot commented Jul 27, 2022 •
edited
Loading

Codecov Report

Merging #1093 (45dcb3a) into sdf9 (09f44c1) will not change coverage.
The diff coverage is n/a.

❗ Current head 45dcb3a differs from pull request most recent head d10bbda. Consider uploading reports for the commit d10bbda to get more accurate results

@@           Coverage Diff           @@
##             sdf9    #1093   +/-   ##
=======================================
  Coverage   87.59%   87.59%           
=======================================
  Files          64       64           
  Lines       10061    10061           
=======================================
  Hits         8813     8813           
  Misses       1248     1248

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 09f44c1...d10bbda. Read the comment docs.

@scpeters scpeters merged commit 3e76d92 into sdf9 Jul 27, 2022
@scpeters scpeters deleted the scpeters/relocatable_9 branch July 27, 2022 20:08
@scpeters scpeters mentioned this pull request Aug 11, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacobperron jacobperron jacobperron approved these changes

@azeey azeey Awaiting requested review from azeey azeey is a code owner

Assignees
No one assigned
Labels
🏰 citadel Ignition Citadel Gazebo 1️1️ Dependency of Gazebo classic version 11
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scpeters @jacobperron @Pro