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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Drake 1.34.0 #368

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Upgrade to Drake 1.34.0 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e8479
Upgrade to Drake 1.34.0
jwnimmer-tri Oct 16, 2024
05296bc
Find python before pybind11
BetsyMcPhail Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drake_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ endif()
find_package(ament_cmake_ros REQUIRED)

find_package(drake REQUIRED)
find_package(Python3 COMPONENTS Interpreter Development)
# Must use Drake's fork of Pybind11
find_package(pybind11 REQUIRED HINTS "${drake_DIR}/../pybind11" NO_DEFAULT_PATH)

Expand Down
6 changes: 3 additions & 3 deletions drake_ros/drake.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DRAKE_SUGGESTED_VERSION = struct(
url = "https://github.com/RobotLocomotion/drake/archive/refs/tags/v1.32.0.tar.gz", # noqa
sha256 = "8d8211a1654956891cf43f698d01a3742f3aa2237d03635cb03e6cf3e8631b38", # noqa,
strip_prefix = "drake-1.32.0",
url = "https://github.com/RobotLocomotion/drake/archive/refs/tags/v1.34.0.tar.gz", # noqa
sha256 = "0b57df077192a9480b799320c1edee3cc524d5e9b97aaa6861de09681542175f", # noqa,
strip_prefix = "drake-1.34.0",
)
1 change: 0 additions & 1 deletion drake_ros/drake_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ install(
)

if(BUILD_TESTING)
find_package(Python3 COMPONENTS Interpreter)
find_package(ament_cmake_test REQUIRED)

# TODO(eric.cousineau): I am not sure how to place a test-only Python library
Expand Down
6 changes: 4 additions & 2 deletions drake_ros/viz/scene_markers_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ class SceneGeometryToMarkers : public drake::geometry::ShapeReifier {
marker.scale.y = convex.scale();
marker.scale.z = convex.scale();
// Assume it is an absolute path and turn it into a file URL.
marker.mesh_resource = "file://" + convex.filename();
DRAKE_THROW_UNLESS(convex.source().is_path());
marker.mesh_resource = "file://" + convex.source().path().string();
marker.pose = RigidTransformToRosPose(X_FG_);
}

Expand All @@ -226,7 +227,8 @@ class SceneGeometryToMarkers : public drake::geometry::ShapeReifier {
marker.scale.y = mesh.scale();
marker.scale.z = mesh.scale();
// Assume it is an absolute path and turn it into a file URL.
marker.mesh_resource = "file://" + mesh.filename();
DRAKE_THROW_UNLESS(mesh.source().is_path());
marker.mesh_resource = "file://" + mesh.source().path().string();
marker.pose = RigidTransformToRosPose(X_FG_);
}

Expand Down
2 changes: 2 additions & 0 deletions ros2_example_bazel_installed/setup/prereq-rosdep-keys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ libfreetype6-dev
libopencv-dev
liborocos-kdl-dev
libpcl-all-dev
libpcl-common
libpcl-io
libqt5-core
libqt5-gui
libqt5-opengl
Expand Down
Loading