FindIgnOGRE2: preserve PKG_CONFIG_PATH #319
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The FindIgnOGRE2 module makes changes to PKG_CONFIG_PATH during the search. These changes ensure that the original value of this environment variable is restored. Signed-off-by: Steve Peters <[email protected]>
* Check the minor version matches. * Forward the link directories to be used by RPath. * Unset OGRE2_* variables if not found. Signed-off-by: Steve Peters <[email protected]>
mjcarroll
approved these changes
Nov 2, 2022
This was referenced Nov 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🦟 Bug fix
Fixes osrf/homebrew-simulation#2115
Summary
While debugging osrf/homebrew-simulation#2115, I noticed that the
PKG_CONFIG_PATHenvironment variable was changing between subsequent iterations of loops in theFindIgnOGRE2module. The changes in 0381785 should preserve the originalPKG_CONFIG_PATHvalue.I also backported some fixes to this module from
gz-cmake3(#283 and #297) in 9f1f488:OGRE2_*variables if not found.Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.