Merge: 3 -> main #386
Merged
Merge: 3 -> main #386
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
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
* Bump version to 2.17.0 * Update Changelog --------- Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Using the pull_request_target event allows this to work for PRs created from a fork. Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
When `gz_find_package` is called without a VERSION argument, the
`<package>_FIND_VERSION` variable is empty. But in most of our
`Find*.cmake` modules, we add a pkg-config entry that assumes the
version is there.
Example:
```
gz_pkg_config_entry(GzProtobuf "protobuf >= ${GzProtobuf_FIND_VERSION}")
```
The pkg-config entry will then be "protobuf >= ", which is invalid and
causes the following entry to be treated as a version number.
The fix here removes the operator if the version is empty.
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
…gconfig (#376) Signed-off-by: Robbert Proost <robbert.proost@outlook.com>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-cmake2 ➡️ gz-cmake3
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
* Move DL fatal message Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> * Move error location Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> --------- Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org> Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Martin Pecka <peci1@seznam.cz>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
mjcarroll
approved these changes
Sep 26, 2023
scpeters
approved these changes
Sep 26, 2023
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 gz-cmake3 to main
Branch comparison: main...gz-cmake3
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)