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 gz-transport13 ➡️ gz-transport14 #563

Merged
merged 5 commits into from
Dec 9, 2024

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Dec 9, 2024

➡️ Forward port

Port gz-transport13 ➡️ gz-transport14

Branch comparison: gz-transport14...gz-transport13

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

akky20 and others added 5 commits August 13, 2024 13:33
12 ➡️ 13 - Disable playback.ReplayStep for windows (#517)
This allows the python/CMakeLists.txt file to be built
as a top-level cmake project against an external gz-transport
library, with documentation added to the installation tutorial.

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: Silvio Traversaro <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
(cherry picked from commit 250e95f)
@scpeters scpeters requested a review from caguero as a code owner December 9, 2024 18:09
@github-actions github-actions bot added 🏛️ ionic Gazebo Ionic 🪵 jetty Gazebo Jetty labels Dec 9, 2024
@scpeters scpeters merged commit 818d8c4 into gz-transport14 Dec 9, 2024
11 checks passed
@scpeters scpeters deleted the scpeters/merge_13_14 branch December 9, 2024 19:02
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