Merge ign-cmake2 ➡️ gz-cmake3 #322
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. This also backports the following fixes from Garden: * Check that 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]>
* Bump version to 2.16.0 * Update changelog Signed-off-by: Jose Luis Rivero <[email protected]>
j-rivero
approved these changes
Nov 11, 2022
the conflicts are quite tricky these days, but I made the PR for #319, so I knew what to expect |
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.
➡️ Forward port
Port
ign-cmake2➡️gz-cmake3Branch comparison: gz-cmake3...ign-cmake2
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)