Skip to content

Commit

Permalink
Bumps in jetty : ci_matching_branch/bump_jetty_gz-sim10
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
  • Loading branch information
azeey committed Jan 17, 2025
1 parent e63e8d8 commit ea9bace
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ libglew-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-fuel-tools10-dev
libgz-gui9-dev
libgz-gui10-dev
libgz-math8-eigen3-dev
libgz-msgs11-dev
libgz-physics8-dev
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools10_VERSION_MAJOR})

#--------------------------------------
# Find gz-gui
gz_find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
gz_find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})
gz_find_package (Qt5
COMPONENTS
Core
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update \
libgz-rendering9-dev \
libgz-tools2-dev \
libgz-transport14-dev \
libgz-gui9-dev \
libgz-gui10-dev \
libgz-msgs11-dev \
libgz-sensors9-dev \
libsdformat15-dev
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/rendering_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(GUI_PLUGIN RenderingGuiPlugin)

set(CMAKE_AUTOMOC ON)

find_package(gz-gui9 REQUIRED)
find_package(gz-gui10 REQUIRED)

QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)

Expand All @@ -24,7 +24,7 @@ add_library(${GUI_PLUGIN} SHARED
)
target_link_libraries(${GUI_PLUGIN}
PRIVATE
gz-gui9::gz-gui9
gz-gui10::gz-gui10
gz-rendering9::gz-rendering9
)

Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<depend>gz-cmake4</depend>
<depend>gz-common6</depend>
<depend>gz-fuel_tools10</depend>
<depend>gz-gui9</depend>
<depend>gz-gui10</depend>
<depend>gz-math8</depend>
<depend>gz-msgs11</depend>
<depend>gz-physics8</depend>
Expand Down

0 comments on commit ea9bace

Please sign in to comment.