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

Changes for OGRE-2.3 #283

Merged
merged 8 commits into from
Jul 26, 2022
Merged

Changes for OGRE-2.3 #283

merged 8 commits into from
Jul 26, 2022

Conversation

mjcarroll
Copy link
Contributor

@mjcarroll mjcarroll commented Jul 20, 2022

🎉 New feature

Summary

CMake updates to make gz-cmake compatible with OGRE-2.3 debs built by OpenRobotics

Test it

For linux (jammy and focal):

For homebrew:

cd gz-cmake/examples/find_ogre2/ogre-2.3
mkdir build && cd build
cmake ..

The expected output with the debs installed

-- Looking for GzOGRE2 - found

-- OGRE2_FOUND: TRUE
-- OGRE2_LIBRARIES: /usr/lib/x86_64-linux-gnu/OGRE-2.3/libOgreNextMain.so
-- OGRE2_INCLUDE_DIRS: /usr/include/OGRE-2.3/usr/include/OGRE-2.3/RenderSystems/GL3Plus
-- OGRE2_VERSION: 2.3.1
-- OGRE2_VERSION_MAJOR: 2
-- OGRE2_VERSION_MINOR: 3
-- OGRE2_VERSION_PATCH: 1
-- OGRE2_RESOURCE_PATH: /usr/lib/x86_64-linux-gnu/OGRE-2.3/OGRE
-- Configuring done
-- Generating done
-- Build files have been written to: /home/mjcarroll/workspaces/gz_garden/src/gz-cmake/examples/find_ogre2/ogre-2.3/build

Similarly, the ogre-2.2 demo should continue to find 2.2.5 on jammy.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • 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.

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jul 20, 2022
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have this issue

CMake Error in ogre2/src/CMakeLists.txt:
  Imported target "GzOGRE2::GzOGRE2" includes non-existent path

    "/usr/include/OGRE-2.3/OGRE"

I resolved with

mkdir /usr/include/OGRE-2.3/OGRE

is this related with this code?

@mjcarroll
Copy link
Contributor Author

CMake Error in ogre2/src/CMakeLists.txt:
  Imported target "GzOGRE2::GzOGRE2" includes non-existent path

    "/usr/include/OGRE-2.3/OGRE"

To be clear, this was building from source and not using the debs, correct?

@ahcorde
Copy link
Contributor

ahcorde commented Jul 20, 2022

CMake Error in ogre2/src/CMakeLists.txt:
  Imported target "GzOGRE2::GzOGRE2" includes non-existent path

    "/usr/include/OGRE-2.3/OGRE"

To be clear, this was building from source and not using the debs, correct?

yes, I was compiling from source

@mjcarroll
Copy link
Contributor Author

yes, I was compiling from source

Can you test the debs from above and see if the error persists?

@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

@mjcarroll
Copy link
Contributor Author

I have done test builds on all three platforms using this branch.

@chapulina chapulina added the enhancement New feature or request label Jul 23, 2022
@scpeters scpeters requested a review from ahcorde July 26, 2022 03:32
@mjcarroll mjcarroll merged commit 4823bd0 into main Jul 26, 2022
@mjcarroll mjcarroll deleted the mjcarroll/ogre23 branch July 26, 2022 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request 🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants