-
Notifications
You must be signed in to change notification settings - Fork 106
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Merge sdf14 ➡️ sdf15 #1501
Merged
Merged
Merge sdf14 ➡️ sdf15 #1501
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
* Fix symbol checking test The test that checks for prefixed binary symbols was broken when compiled with DebWithRelInfo since it was checking debugging symbols that broke the heuristics used. The commit fixes it doing a couple of actions: - Include the length of the namespace sdf: 3sdf - Check only dynamic symbols being exported Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> * Update test/integration/all_symbols_have_version.bash.in Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> --------- Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org> (cherry picked from commit 904706c)
Backport of #1490. * Refer to https://brew.sh instead of duplicating the brew installation command. * List cmake variables in a markdown table. * Combine Ubuntu and macOS installation instructions (cherry picked from commit 22684cb) Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
…1497) Backport of #1491 with adapted package finding logic and a note about requiring cmake 3.22.1. This allows the src/python_pybind11/CMakeLists.txt file to be built as a top-level cmake project against an external sdformat library, with documentation added to the README. The logic for finding pybind11 is also moved from the root CMakeLists.txt to python/CMakeLists.txt to reduce code duplication. When invoked through the root CMakeLists.txt, pybind11 is treated as an optional dependency, but when invoked from the python folder, pybind11 is treated as required by setting the variable CMAKE_REQUIRE_FIND_PACKAGE_pybind11 to TRUE. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Silvio Traversaro <silvio@traversaro.it> Co-authored-by: Silvio Traversaro <silvio@traversaro.it> (cherry picked from commit 3dcdd55)
* Support removing the actor, light, or model from the root Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Update src/Root_TEST.cc Co-authored-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> --------- Signed-off-by: Nate Koenig <natekoenig@gmail.com> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
shameekganguly
approved these changes
Nov 13, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# 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
sdf14
➡️sdf15
Branch comparison: sdf15...sdf14
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)