Skip to content

Commit edcbf86

Browse files
scpetersj-rivero
scpeters
and
j-rivero
authored
Bump gz-cmake and others in jetty (#2910)
Bumping gz-cmake and others except gz-tools. Fix deprecation warnings: * Conversions: use pixel_format and navsat instead of gps * SceneBroadcaster: use pixel_format Stop using and remove gz_test_deps. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com> Co-authored-by: Jose Luis Rivero <jrivero@honurobotics.com>
1 parent 049c19e commit edcbf86

129 files changed

Lines changed: 289 additions & 320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ci/packages.apt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@ freeglut3-dev
22
libbenchmark-dev
33
libfreeimage-dev
44
libglew-dev
5-
libgz-cmake4-dev
6-
libgz-common6-dev
7-
libgz-fuel-tools10-dev
5+
libgz-cmake5-dev
6+
libgz-common7-dev
7+
libgz-fuel-tools11-dev
88
libgz-gui10-dev
9-
libgz-math8-eigen3-dev
10-
libgz-msgs11-dev
11-
libgz-physics8-dev
12-
libgz-plugin3-dev
13-
libgz-rendering9-dev
9+
libgz-math9-eigen3-dev
10+
libgz-msgs12-dev
11+
libgz-physics9-dev
12+
libgz-plugin4-dev
13+
libgz-rendering10-dev
1414
libgz-sensors10-dev
1515
libgz-tools2-dev
1616
libgz-transport15-dev
17-
libgz-utils3-cli-dev
17+
libgz-utils4-cli-dev
1818
libogre-1.9-dev
1919
libogre-next-2.3-dev
2020
libprotobuf-dev
2121
libprotoc-dev
22-
libsdformat15-dev
22+
libsdformat16-dev
2323
libtinyxml2-dev
2424
libxi-dev
2525
libxmu-dev
2626
libpython3-dev
27-
python3-gz-math8
28-
python3-gz-msgs11
27+
python3-gz-math9
28+
python3-gz-msgs12
2929
python3-gz-transport15
3030
python3-pybind11
3131
python3-pytest
32-
python3-sdformat15
32+
python3-sdformat16
3333
qml6-module-qt-labs-folderlistmodel
3434
qml6-module-qt-labs-settings
3535
qml6-module-qt5compat-graphicaleffects

‎CMakeLists.txt‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set (GZ_DISTRIBUTION "Jetty")
1010
# Find gz-cmake
1111
#============================================================================
1212
# If you get an error at this line, you need to install gz-cmake
13-
find_package(gz-cmake4 REQUIRED)
13+
find_package(gz-cmake REQUIRED)
1414

1515
#============================================================================
1616
# Configure the project
@@ -74,27 +74,24 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
7474
# as protobuf could be find transitively by any dependency
7575
set(protobuf_MODULE_COMPATIBLE TRUE)
7676

77-
gz_find_package(sdformat15 REQUIRED)
78-
set(SDF_VER ${sdformat15_VERSION_MAJOR})
77+
gz_find_package(sdformat REQUIRED)
7978

8079
#--------------------------------------
8180
# Find gz-plugin
82-
gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register)
83-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
81+
gz_find_package(gz-plugin REQUIRED COMPONENTS loader register)
8482

8583
#--------------------------------------
8684
# Find gz-transport
8785
gz_find_package(gz-transport REQUIRED COMPONENTS log parameters)
8886

8987
#--------------------------------------
9088
# Find gz-msgs
91-
gz_find_package(gz-msgs11 REQUIRED)
92-
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
89+
gz_find_package(gz-msgs REQUIRED)
9390

9491
#--------------------------------------
9592
# Find gz-common
9693
# Always use the profiler component to get the headers, regardless of status.
97-
gz_find_package(gz-common6
94+
gz_find_package(gz-common
9895
COMPONENTS
9996
av
10097
events
@@ -103,12 +100,10 @@ gz_find_package(gz-common6
103100
profiler
104101
REQUIRED
105102
)
106-
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
107103

108104
#--------------------------------------
109105
# Find gz-fuel_tools
110-
gz_find_package(gz-fuel_tools10 REQUIRED)
111-
set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools10_VERSION_MAJOR})
106+
gz_find_package(gz-fuel_tools REQUIRED)
112107

113108
# Option to build gz-sim with GUI support
114109
option(ENABLE_GUI "Build gz-sim with GUI enabled" ON)
@@ -137,14 +132,13 @@ endif()
137132

138133
#--------------------------------------
139134
# Find gz-physics
140-
gz_find_package(gz-physics8
135+
gz_find_package(gz-physics
141136
COMPONENTS
142137
heightmap
143138
mesh
144139
sdf
145140
REQUIRED
146141
)
147-
set(GZ_PHYSICS_VER ${gz-physics8_VERSION_MAJOR})
148142

149143
#--------------------------------------
150144
# Find gz-sensors
@@ -179,13 +173,11 @@ gz_find_package(gz-sensors REQUIRED
179173

180174
#--------------------------------------
181175
# Find gz-rendering
182-
gz_find_package(gz-rendering9 REQUIRED)
183-
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
176+
gz_find_package(gz-rendering REQUIRED)
184177

185178
#--------------------------------------
186179
# Find gz-math
187-
gz_find_package(gz-math8 REQUIRED COMPONENTS eigen3)
188-
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
180+
gz_find_package(gz-math REQUIRED COMPONENTS eigen3)
189181

190182
#--------------------------------------
191183
# Find if gz command is available
@@ -201,16 +193,15 @@ set(GZ_TOOLS_VER 2)
201193

202194
#--------------------------------------
203195
# Find gz-utils
204-
gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
205-
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
196+
gz_find_package(gz-utils REQUIRED COMPONENTS cli)
206197

207198
#--------------------------------------
208199
# Find protobuf
209200
gz_find_package(GzProtobuf
210201
REQUIRED
211202
COMPONENTS all
212203
PRETTY Protobuf)
213-
set(Protobuf_IMPORT_DIRS ${gz-msgs11_INCLUDE_DIRS})
204+
set(Protobuf_IMPORT_DIRS ${gz-msgs12_INCLUDE_DIRS})
214205

215206
#--------------------------------------
216207
# Find python

‎docker/Dockerfile.nightly‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ RUN scripts/enable_nightly.sh
1111

1212
RUN apt-get update \
1313
&& apt-get install -y \
14-
libgz-cmake4-dev \
15-
libgz-common6-dev \
16-
libgz-fuel-tools10-dev \
17-
libgz-math8-eigen3-dev \
18-
libgz-plugin3-dev \
19-
libgz-physics8-dev \
20-
libgz-rendering9-dev \
14+
libgz-cmake5-dev \
15+
libgz-common7-dev \
16+
libgz-fuel-tools11-dev \
17+
libgz-math9-eigen3-dev \
18+
libgz-plugin4-dev \
19+
libgz-physics9-dev \
20+
libgz-rendering10-dev \
2121
libgz-tools2-dev \
2222
libgz-transport15-dev \
2323
libgz-gui10-dev \
24-
libgz-msgs11-dev \
24+
libgz-msgs12-dev \
2525
libgz-sensors10-dev \
26-
libsdformat15-dev \
26+
libsdformat16-dev \
2727
&& apt-get clean \
2828
&& rm -rf /var/lib/apt/lists/*
2929

‎docker/scripts/build_gz.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Command line parameters:
33
# 1 - github organization name. For example gazebosim or osrf.
44
# 2 - the name of the Gazebo repository. For example gz-math.
5-
# 3 - the name of the branch. For example gz-math8
5+
# 3 - the name of the branch. For example gz-math9
66

77
set -o errexit
88
set -o verbose

‎docker/scripts/upload_json_benchmark.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Command line parameters:
33
# 1 - github organization name. For example gazebosim or osrf.
44
# 2 - the name of the Gazebo repository. For example gz-math.
5-
# 3 - the name of the branch. For example gz-math8
5+
# 3 - the name of the branch. For example gz-math9
66

77
set -o errexit
88
set -o verbose

‎examples/plugin/command_actor/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

3-
find_package(gz-cmake4 REQUIRED)
3+
find_package(gz-cmake REQUIRED)
44

55
project(CommandActor)
66

7-
find_package(gz-plugin3 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
7+
find_package(gz-plugin REQUIRED COMPONENTS register)
98

109
find_package(gz-sim REQUIRED)
1110
add_library(CommandActor SHARED CommandActor.cc)
1211
set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
1312
target_link_libraries(CommandActor
14-
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
13+
PRIVATE gz-plugin::gz-plugin
1514
PRIVATE gz-sim::gz-sim)

‎examples/plugin/custom_component/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

3-
find_package(gz-cmake4 REQUIRED)
3+
find_package(gz-cmake REQUIRED)
44

55
project(CustomComponentPlugin)
66

7-
find_package(gz-plugin3 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
7+
find_package(gz-plugin REQUIRED COMPONENTS register)
98

109
find_package(gz-sim REQUIRED)
1110
add_library(CustomComponentPlugin SHARED
1211
CustomComponentPlugin.cc
1312
)
1413
set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
1514
target_link_libraries(CustomComponentPlugin
16-
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
15+
PRIVATE gz-plugin::gz-plugin
1716
PRIVATE gz-sim::gz-sim)

‎examples/plugin/custom_sensor_system/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

3-
find_package(gz-cmake4 REQUIRED)
3+
find_package(gz-cmake REQUIRED)
44

55
project(OdometerSystem)
66

7-
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
7+
gz_find_package(gz-plugin REQUIRED COMPONENTS register)
98

109
gz_find_package(gz-sim REQUIRED)
1110

@@ -26,7 +25,7 @@ add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_cl
2625
add_library(${PROJECT_NAME} SHARED ${PROJECT_NAME}.cc)
2726
target_link_libraries(${PROJECT_NAME}
2827
PRIVATE
29-
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
28+
gz-plugin::gz-plugin
3029
gz-sim::gz-sim
3130
gz-sensors::gz-sensors
3231
odometer

‎examples/plugin/hello_world/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

3-
find_package(gz-cmake4 REQUIRED)
3+
find_package(gz-cmake REQUIRED)
44

55
project(Hello_world)
66

7-
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
7+
gz_find_package(gz-plugin REQUIRED COMPONENTS register)
98

109
gz_find_package(gz-sim REQUIRED)
1110

1211
add_library(HelloWorld SHARED HelloWorld.cc)
1312
set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)
1413
target_link_libraries(HelloWorld
15-
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
14+
PRIVATE gz-plugin::gz-plugin
1615
PRIVATE gz-sim::gz-sim)

‎examples/plugin/priority_printer_plugin/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

3-
find_package(gz-cmake4 REQUIRED)
3+
find_package(gz-cmake REQUIRED)
44

55
project(Priority_printer)
66

7-
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
7+
gz_find_package(gz-plugin REQUIRED COMPONENTS register)
98

109
gz_find_package(gz-sim REQUIRED)
1110

1211
add_library(PriorityPrinter SHARED PriorityPrinter.cc)
1312
set_property(TARGET PriorityPrinter PROPERTY CXX_STANDARD 17)
1413
target_link_libraries(PriorityPrinter
15-
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
14+
PRIVATE gz-plugin::gz-plugin
1615
PRIVATE gz-sim::gz-sim)

0 commit comments

Comments
 (0)