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

Fix finding ogre 2.3 installed from source #342

Merged
merged 3 commits into from
Jun 7, 2023
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Apr 5, 2023

🦟 Bug fix

Summary

When building gz with ogre-next 2.3 from source, cmake has trouble finding ogre-next because the OGRE2_LIBRARY_DIRS is empty and OGRE2_RESOURCE_PATH points to the incorrect dir.

  • OGRE2_LIBRARY_DIRS: Turns out that variable is set by a STRING REPLACE call that never gets called because the if check before string replace seems incorrect - I updated to make sure the input string exists before doing the replace call (originally the logic checks that the input string does not exist).
  • OGRE2_RESOURCE_PATH: when built from source, the ogre plugins are installed to a dir called OGRE-Next instead of OGRE

Tested with ogre-next 2.3 installed from https://github.com/gazebo-forks/ogre-next/tree/gazebo/v2-3

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 Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

iche033 added 2 commits April 5, 2023 21:27
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@github-actions github-actions bot added 🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic labels Apr 5, 2023
@mjcarroll
Copy link
Contributor

I think I addressed this in #302, though it is a larger change

@iche033
Copy link
Contributor Author

iche033 commented Apr 7, 2023

I think I addressed this in #302, though it is a larger change

ah I see, I'll give that a try

@j-rivero
Copy link
Contributor

j-rivero commented Jun 7, 2023

@osrf-jenkins run tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants