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 FindIgnOgre on Windows when not using vcpkg #124

Merged
merged 3 commits into from
Nov 16, 2020

Conversation

traversaro
Copy link
Contributor

The current version of FindIgnOgre contains a vcpkg-specific workaround on the location of the OgreMain library, that is fixed to point to the "${OGRE_LIBRARY_DIRS}/manual-link/" directory, that it is its location when Ogre is installed by vcpkg.

However, this creates a problem when installing Ogre with other package managers on Windows, for example when using conda-forge or conan. To mitigate this problem, we only set the location of the OgreMain library to be "${OGRE_LIBRARY_DIRS}/manual-link/" only if this directory exists, that is only true for vcpkg installations.

@traversaro traversaro requested a review from mxgrey as a code owner November 8, 2020 17:51
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🏰 citadel Ignition Citadel 📜 blueprint Ignition Blueprint 🔮 dome Ignition Dome labels Nov 8, 2020
The current version of FindIgnOgre contains a vcpkg-specific workaround on the location of the OgreMain
library, that is fixed to point to the "${OGRE_LIBRARY_DIRS}/manual-link/" directory, that it is its location when
Ogre is installed by vcpkg. However, this creates a problem when installing Ogre with other package managers
on Windows, for example when using conda-forge or conan. To mitigate this problem, we only set the location of
the OgreMain library to be "${OGRE_LIBRARY_DIRS}/manual-link/" only if this directory exists, that is only true for
vcpkg installations.

Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
@traversaro
Copy link
Contributor Author

FYI:

@traversaro
Copy link
Contributor Author

Related comment: conda-forge/libignition-cmake0-feedstock#3 (comment) .

Copy link
Contributor

@j-rivero j-rivero left a comment

Choose a reason for hiding this comment

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

Thanks Silvio. Seems totally safe to me. Let's wait for the new round of CI before merging.

Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

this looks like a small, safe change to me

@scpeters scpeters merged commit 106187d into gazebosim:ign-cmake2 Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📜 blueprint Ignition Blueprint 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome 🏢 edifice Ignition Edifice Windows Windows support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants