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

Support for Windows conda-forge ogre-next recipe (gz-cmake2) #464

Open
wants to merge 1 commit into
base: ign-cmake2
Choose a base branch
from

Conversation

j-rivero
Copy link
Contributor

🎉 New feature

Summary

Part of the Conda migration works. Support for find ogre-next library in Conda (version target in Fortress is 2.2.6).

I've tested it in https://build.osrfoundation.org/job/_test_gz_rendering-pr-cwin/65/consoleFull#console-section-14 with a more verbose branch that prints out the paths of components and plugins found.

Test it

Install ogre-next 2.2.6 from Conda and run the configuration of gz-rendering6 using this branch of gz-cmake2.

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.

@j-rivero j-rivero requested a review from scpeters as a code owner December 13, 2024 13:47
@github-actions github-actions bot added 🏯 fortress Ignition Fortress 🏰 citadel Ignition Citadel labels Dec 13, 2024
if(DEFINED ENV{CONDA_PREFIX})
list(APPEND OGRE2_PATHS $ENV{CONDA_PREFIX})
set(OGREMAIN_LIB_NAME "OgreNextMain")
set(OGRENEXT_PATH_SUFFIXES "Library/include/OGRE-Next")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a bit brittle, as the presence or Library or not depends on weather Windows is used or not. Furthermore, ${CONDA_PREFIX}/Library should already be in the CMAKE_SYSTEM_PREFIX_PATH, so it should be just sufficient to add OGRE-Next to the PATH_SUFFIXES, even unconditionally. Similarly, there should be no need for passing $ENV{CONDA_PREFIX} to OGRE2_PATHS , as the ${CONDA_PREFIX}/Library is already in CMAKE_SYSTEM_PREFIX_PATH . Which cmake version are you using in the CI?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel 🏯 fortress Ignition Fortress
Projects
Status: In review
Development

Successfully merging this pull request may close these issues.

4 participants