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

Merge sdf14 ➡️ sdf15 #1501

Merged
merged 5 commits into from
Nov 13, 2024
Merged

Merge sdf14 ➡️ sdf15 #1501

merged 5 commits into from
Nov 13, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf14 ➡️ sdf15

Branch comparison: sdf15...sdf14

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

j-rivero and others added 5 commits August 27, 2024 15:22
* 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 <[email protected]>

* Update test/integration/all_symbols_have_version.bash.in

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
(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 <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
…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 <[email protected]>
Signed-off-by: Silvio Traversaro <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
(cherry picked from commit 3dcdd55)
* Support removing the actor, light, or model from the root

Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

* Update src/Root_TEST.cc

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

---------

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from azeey as a code owner November 13, 2024 21:05
@github-actions github-actions bot added 🏛️ ionic Gazebo Ionic 🪵 jetty Gazebo Jetty labels Nov 13, 2024
@scpeters scpeters merged commit b105b30 into sdf15 Nov 13, 2024
17 checks passed
@scpeters scpeters deleted the scpeters/merge_14_15 branch November 13, 2024 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic 🪵 jetty Gazebo Jetty
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants