Skip to content

rviz_ogre_vendor: use absolute install names on macOS (jazzy, lyrical, rolling) #185

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

Open
mini-1235 wants to merge 2 commits into
base: main
Choose a base branch
from
+111 −3
Open

rviz_ogre_vendor: use absolute install names on macOS (jazzy, lyrical, rolling) #185

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
c72003e
rviz_ogre_vendor: use absolute install names on macOS
mini-1235 Nov 2, 2026
e4e2020
Merge upstream main into fix/rviz-ogre-rpath-osx
mini-1235 Nov 5, 2026
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
14 changes: 14 additions & 0 deletions distros/jazzy/patch/ros2-rviz-ogre-vendor.osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,3 +83,10 @@

+if(APPLE)
+ # Consumers record this path, so they find Ogre without an RPATH to opt/.
+ list(APPEND OGRE_CMAKE_ARGS
+ "-DCMAKE_INSTALL_NAME_DIR=${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/lib"
+ -DCMAKE_MACOSX_RPATH:BOOL=OFF)
+endif()
+
ament_vendor(ogre_vendor
VCS_URL https://github.com/OGRECave/ogre.git
26 changes: 25 additions & 1 deletion distros/jazzy/pkg_additional_info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,35 @@ ament_cmake_gmock: # as ament_cmake_gtest
build_number: 28
ament_cmake_gtest: # uses conda-forge's gtest instead of gtest_vendor's sources
build_number: 28
fuse_viz:
build_number: 28
grid_map_rviz_plugin:
build_number: 28
gz_ogre_next_vendor:
build_number: 28
moveit_ros_visualization:
build_number: 28
moveit_task_constructor_visualization:
build_number: 28
nav2_rviz_plugins:
build_number: 28
octomap_rviz_plugins:
build_number: 28
rviz_2d_overlay_plugins:
build_number: 28
rviz_common:
build_number: 28
rviz_default_plugins:
build_number: 28
rviz_imu_plugin:
build_number: 28
rviz_ogre_vendor:
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
build_number: 28 # built without the EXR codec (ros2-rviz-ogre-vendor.patch)
build_number: 29 # built without the EXR codec (ros2-rviz-ogre-vendor.patch), absolute install names on macOS (.osx.patch)
rviz_rendering:
build_number: 28
rviz_satellite:
build_number: 28
spatio_temporal_voxel_layer:
build_number: 28
urdf: # drop deprecated urdf_world/types.h include (ros2/urdf#54) for headers 3.x
Expand Down
14 changes: 14 additions & 0 deletions distros/lyrical/patch/ros2-rviz-ogre-vendor.osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,3 +45,10 @@

+if(APPLE)
+ # Consumers record this path, so they find Ogre without an RPATH to opt/.
+ list(APPEND OGRE_CMAKE_ARGS
+ "-DCMAKE_INSTALL_NAME_DIR=${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/lib"
+ -DCMAKE_MACOSX_RPATH:BOOL=OFF)
+endif()
+
ament_vendor(ogre_vendor
VCS_URL https://github.com/OGRECave/ogre.git
26 changes: 25 additions & 1 deletion distros/lyrical/pkg_additional_info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,32 @@ urdfdom_headers:
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
# Remove build_number fields below on new full rebuild
fuse_viz:
build_number: 31
grid_map_rviz_plugin:
build_number: 31
moveit_ros_visualization:
build_number: 31
moveit_task_constructor_visualization:
build_number: 31
nav2_rviz_plugins:
build_number: 31
rtabmap_rviz_plugins:
build_number: 31
rviz_2d_overlay_plugins:
build_number: 31
rviz_common:
build_number: 31
rviz_default_plugins:
build_number: 31
rviz_imu_plugin:
build_number: 31
rviz_ogre_vendor:
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
build_number: 31 # built without the EXR codec (ros2-rviz-ogre-vendor.patch)
build_number: 32 # built without the EXR codec (ros2-rviz-ogre-vendor.patch), absolute install names on macOS (.osx.patch)
rviz_rendering:
build_number: 31
rviz_satellite:
build_number: 31
spatio_temporal_voxel_layer:
build_number: 31
14 changes: 14 additions & 0 deletions distros/rolling/patch/ros2-rviz-ogre-vendor.osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,3 +45,10 @@

+if(APPLE)
+ # Consumers record this path, so they find Ogre without an RPATH to opt/.
+ list(APPEND OGRE_CMAKE_ARGS
+ "-DCMAKE_INSTALL_NAME_DIR=${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/lib"
+ -DCMAKE_MACOSX_RPATH:BOOL=OFF)
+endif()
+
ament_vendor(ogre_vendor
VCS_URL https://github.com/OGRECave/ogre.git
20 changes: 19 additions & 1 deletion distros/rolling/pkg_additional_info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,24 @@ urdfdom_headers:
override_version: '3.0.0'
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
fuse_viz:
build_number: 33
moveit_ros_visualization:
build_number: 33
moveit_task_constructor_visualization:
build_number: 33
rviz_2d_overlay_plugins:
build_number: 33
rviz_common:
build_number: 33
rviz_default_plugins:
build_number: 33
rviz_imu_plugin:
build_number: 33
rviz_ogre_vendor:
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
build_number: 33 # built without the EXR codec (ros2-rviz-ogre-vendor.patch)
build_number: 34 # built without the EXR codec (ros2-rviz-ogre-vendor.patch), absolute install names on macOS (.osx.patch)
rviz_rendering:
build_number: 33
rviz_satellite:
build_number: 33
Loading