Skip to content

Commit

Permalink
Ionic: fix some plugin paths (#2557)
Browse files Browse the repository at this point in the history
* gz-gui9 and gz-launch8

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters authored Feb 12, 2024
1 parent d9e8b42 commit 3d3e670
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Formula/gz-gui9.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class GzGui9 < Formula
def install
rpaths = [
rpath,
rpath(source: lib/"gz-gui-8/plugins", target: lib),
rpath(source: lib/"gz-gui-9/plugins", target: lib),
]
cmake_args = std_cmake_args
cmake_args << "-DBUILD_TESTING=Off"
Expand All @@ -40,7 +40,7 @@ def install
extend SystemCommand::Mixin
# test some plugins in subfolders
%w[CameraFps Publisher TopicViewer WorldStats].each do |plugin|
p = lib/"gz-gui-8/plugins/lib#{plugin}.dylib"
p = lib/"gz-gui-9/plugins/lib#{plugin}.dylib"
# Use gz-plugin --info command to check plugin linking
cmd = Formula["gz-plugin3"].opt_libexec/"gz/plugin3/gz-plugin"
args = ["--info", "--plugin"] << p
Expand Down
4 changes: 2 additions & 2 deletions Formula/gz-launch8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def install
rpaths = [
rpath,
rpath(source: lib/"gz/launch8", target: lib),
rpath(source: lib/"gz-launch-7/plugins", target: lib),
rpath(source: lib/"gz-launch-8/plugins", target: lib),
]
cmake_args = std_cmake_args
cmake_args << "-DBUILD_TESTING=OFF"
Expand All @@ -46,7 +46,7 @@ def install
system lib/"gz/launch8/gz-launch"
# test plugins in subfolders
%w[joytotwist sim-factory sim simgui].each do |plugin|
p = lib/"gz-launch-7/plugins/libgz-launch-#{plugin}.dylib"
p = lib/"gz-launch-8/plugins/libgz-launch-#{plugin}.dylib"
# Use gz-plugin --info command to check plugin linking
cmd = Formula["gz-plugin3"].opt_libexec/"gz/plugin3/gz-plugin"
args = ["--info", "--plugin"] << p
Expand Down

0 comments on commit 3d3e670

Please sign in to comment.