Skip to content

Commit f4a3ea4

Browse files
chapulinachapulina
authored
Bumps in fortress : ign-gazebo6 (#764)
Signed-off-by: Louise Poubel <[email protected]>
1 parent 2b3879f commit f4a3ea4

File tree

14 files changed

+72
-72
lines changed

14 files changed

+72
-72
lines changed

‎.github/ci/packages.apt

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ libfreeimage-dev
33
libglew-dev
44
libignition-cmake2-dev
55
libignition-common4-dev
6-
libignition-gui5-dev
7-
libignition-fuel-tools6-dev
6+
libignition-gui6-dev
7+
libignition-fuel-tools7-dev
88
libignition-math6-eigen3-dev
9-
libignition-msgs7-dev
10-
libignition-physics4-dev
9+
libignition-msgs8-dev
10+
libignition-physics5-dev
1111
libignition-plugin-dev
12-
libignition-rendering5-dev
13-
libignition-sensors5-dev
12+
libignition-rendering6-dev
13+
libignition-sensors6-dev
1414
libignition-tools-dev
15-
libignition-transport10-dev
15+
libignition-transport11-dev
1616
libignition-utils1-cli-dev
1717
libogre-1.9-dev
1818
libogre-2.1-dev
1919
libprotobuf-dev
2020
libprotoc-dev
21-
libsdformat11-dev
21+
libsdformat12-dev
2222
libtinyxml2-dev
2323
libxi-dev
2424
libxmu-dev

‎CMakeLists.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ endif()
3838
# Search for project-specific dependencies
3939
#============================================================================
4040

41-
ign_find_package(sdformat11 REQUIRED)
42-
set(SDF_VER ${sdformat11_VERSION_MAJOR})
41+
ign_find_package(sdformat12 REQUIRED)
42+
set(SDF_VER ${sdformat12_VERSION_MAJOR})
4343

4444
#--------------------------------------
4545
# Find ignition-plugin
@@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
4848

4949
#--------------------------------------
5050
# Find ignition-transport
51-
ign_find_package(ignition-transport10 REQUIRED COMPONENTS log)
52-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
51+
ign_find_package(ignition-transport11 REQUIRED COMPONENTS log)
52+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
5353

5454
#--------------------------------------
5555
# Find ignition-msgs
56-
ign_find_package(ignition-msgs7 REQUIRED)
57-
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
56+
ign_find_package(ignition-msgs8 REQUIRED)
57+
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
5858

5959
#--------------------------------------
6060
# Find ignition-common
@@ -70,13 +70,13 @@ set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
7070

7171
#--------------------------------------
7272
# Find ignition-fuel_tools
73-
ign_find_package(ignition-fuel_tools6 REQUIRED)
74-
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools6_VERSION_MAJOR})
73+
ign_find_package(ignition-fuel_tools7 REQUIRED)
74+
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools7_VERSION_MAJOR})
7575

7676
#--------------------------------------
7777
# Find ignition-gui
78-
ign_find_package(ignition-gui5 REQUIRED)
79-
set(IGN_GUI_VER ${ignition-gui5_VERSION_MAJOR})
78+
ign_find_package(ignition-gui6 REQUIRED)
79+
set(IGN_GUI_VER ${ignition-gui6_VERSION_MAJOR})
8080
ign_find_package (Qt5
8181
COMPONENTS
8282
Core
@@ -87,17 +87,17 @@ ign_find_package (Qt5
8787

8888
#--------------------------------------
8989
# Find ignition-physics
90-
ign_find_package(ignition-physics4
90+
ign_find_package(ignition-physics5
9191
COMPONENTS
9292
mesh
9393
sdf
9494
REQUIRED
9595
)
96-
set(IGN_PHYSICS_VER ${ignition-physics4_VERSION_MAJOR})
96+
set(IGN_PHYSICS_VER ${ignition-physics5_VERSION_MAJOR})
9797

9898
#--------------------------------------
9999
# Find ignition-sensors
100-
ign_find_package(ignition-sensors5 REQUIRED
100+
ign_find_package(ignition-sensors6 REQUIRED
101101
COMPONENTS
102102
rendering
103103
air_pressure
@@ -110,12 +110,12 @@ ign_find_package(ignition-sensors5 REQUIRED
110110
depth_camera
111111
thermal_camera
112112
)
113-
set(IGN_SENSORS_VER ${ignition-sensors5_VERSION_MAJOR})
113+
set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})
114114

115115
#--------------------------------------
116116
# Find ignition-rendering
117-
ign_find_package(ignition-rendering5 REQUIRED)
118-
set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR})
117+
ign_find_package(ignition-rendering6 REQUIRED)
118+
set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR})
119119

120120
#--------------------------------------
121121
# Find ignition-math
@@ -143,7 +143,7 @@ ign_find_package(IgnProtobuf
143143
REQUIRED
144144
COMPONENTS all
145145
PRETTY Protobuf)
146-
set(Protobuf_IMPORT_DIRS ${ignition-msgs7_INCLUDE_DIRS})
146+
set(Protobuf_IMPORT_DIRS ${ignition-msgs8_INCLUDE_DIRS})
147147

148148
# Plugin install dirs
149149
set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ line is using symbolic links to each library's YAML file.
235235
```
236236
mkdir ~/.ignition/tools/configs -p
237237
cd ~/.ignition/tools/configs/
238-
ln -s /usr/local/share/ignition/fuel6.yaml .
239-
ln -s /usr/local/share/ignition/transport10.yaml .
240-
ln -s /usr/local/share/ignition/transportlog10.yaml .
238+
ln -s /usr/local/share/ignition/fuel7.yaml .
239+
ln -s /usr/local/share/ignition/transport11.yaml .
240+
ln -s /usr/local/share/ignition/transportlog11.yaml .
241241
...
242242
export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
243243
```

‎bitbucket-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipelines:
2626
libignition-transport8-dev
2727
libsdformat9-dev
2828
libignition-fuel-tools4-dev
29-
libignition-physics4-dev
29+
libignition-physics5-dev
3030
# libignition-common4-dev
3131
# libignition-gui3-dev
3232
# libignition-sensors3-dev
@@ -78,7 +78,7 @@ pipelines:
7878
libignition-tools-dev
7979
# libignition-fuel-tools4-dev
8080
# libignition-physics2-dev
81-
# libsdformat11-dev
81+
# libsdformat12-dev
8282
# libignition-gui3-dev
8383
# libignition-msgs5-dev
8484
# libignition-rendering3-dev

‎docker/Dockerfile.nightly

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ RUN apt-get update \
1313
&& apt-get install -y \
1414
libignition-cmake2-dev \
1515
libignition-common4-dev \
16-
libignition-fuel-tools6-dev \
16+
libignition-fuel-tools7-dev \
1717
libignition-math6-eigen3-dev \
1818
libignition-plugin-dev \
19-
libignition-physics4-dev \
20-
libignition-rendering5-dev \
19+
libignition-physics5-dev \
20+
libignition-rendering6-dev \
2121
libignition-tools-dev \
22-
libignition-transport10-dev \
23-
libignition-gui5-dev \
24-
libignition-msgs7-dev \
25-
libignition-sensors5-dev \
26-
libsdformat11-dev
22+
libignition-transport11-dev \
23+
libignition-gui6-dev \
24+
libignition-msgs8-dev \
25+
libignition-sensors6-dev \
26+
libsdformat12-dev
2727

2828
COPY . ign-gazebo
2929
RUN cd ign-gazebo \

‎examples/plugin/rendering_plugins/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ endif()
77
project(RenderingPlugins)
88

99
# Common to both plugins
10-
find_package(ignition-rendering5 REQUIRED)
10+
find_package(ignition-rendering6 REQUIRED)
1111

1212
# GUI plugin
1313
set(GUI_PLUGIN RenderingGuiPlugin)
1414

1515
set(CMAKE_AUTOMOC ON)
1616

17-
find_package(ignition-gui5 REQUIRED)
17+
find_package(ignition-gui6 REQUIRED)
1818

1919
QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)
2020

@@ -24,8 +24,8 @@ add_library(${GUI_PLUGIN} SHARED
2424
)
2525
target_link_libraries(${GUI_PLUGIN}
2626
PRIVATE
27-
ignition-gui5::ignition-gui5
28-
ignition-rendering5::ignition-rendering5
27+
ignition-gui6::ignition-gui6
28+
ignition-rendering6::ignition-rendering6
2929
)
3030

3131
# Server plugin
@@ -40,5 +40,5 @@ target_link_libraries(${SERVER_PLUGIN}
4040
PRIVATE
4141
ignition-plugin1::ignition-plugin1
4242
ignition-gazebo6::ignition-gazebo6
43-
ignition-rendering5::ignition-rendering5
43+
ignition-rendering6::ignition-rendering6
4444
)

‎examples/standalone/entity_creation/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
3+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
55

66
add_executable(entity_creation entity_creation.cc)
77
target_link_libraries(entity_creation

‎examples/standalone/joy_to_twist/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
3+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
55

6-
find_package(sdformat11 REQUIRED)
7-
set(SDF_VER ${sdformat11_VERSION_MAJOR})
6+
find_package(sdformat12 REQUIRED)
7+
set(SDF_VER ${sdformat12_VERSION_MAJOR})
88

99
add_executable(joy_to_twist joy_to_twist.cc)
1010
target_link_libraries(joy_to_twist

‎examples/standalone/joystick/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22
# joystick currently works only on linux
33

44
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
5-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
6-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
5+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
6+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
77

8-
find_package(sdformat11 REQUIRED)
9-
set(SDF_VER ${sdformat11_VERSION_MAJOR})
8+
find_package(sdformat12 REQUIRED)
9+
set(SDF_VER ${sdformat12_VERSION_MAJOR})
1010

1111
add_executable(joystick joystick.cc)
1212
target_link_libraries(joystick

‎examples/standalone/keyboard/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

33
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
4-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
5-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
4+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
5+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
66

7-
find_package(sdformat11 REQUIRED)
8-
set(SDF_VER ${sdformat11_VERSION_MAJOR})
7+
find_package(sdformat12 REQUIRED)
8+
set(SDF_VER ${sdformat12_VERSION_MAJOR})
99

10-
find_package(ignition-msgs7 REQUIRED)
11-
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
10+
find_package(ignition-msgs8 REQUIRED)
11+
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
1212

1313
find_package(ignition-common4 REQUIRED)
1414
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})

‎examples/standalone/light_control/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
3+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
55

66
find_package(ignition-gazebo6 REQUIRED)
77
set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})

‎examples/standalone/marker/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

33
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
4-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
5-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
4+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
5+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
66

77
find_package(ignition-common4 REQUIRED)
88
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
99

10-
find_package(ignition-msgs7 REQUIRED)
11-
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
10+
find_package(ignition-msgs8 REQUIRED)
11+
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
1212

1313
add_executable(marker marker.cc)
1414
target_link_libraries(marker

‎examples/standalone/scene_requester/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4-
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
3+
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
4+
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
55

66
add_executable(scene_requester scene_requester.cc)
77
target_link_libraries(scene_requester

‎tutorials/migrating_ardupilot_plugin.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -751,14 +751,14 @@ In the new code we explicitly reference each Ignition package that we use:
751751

752752
```
753753
# NEW
754-
find_package(sdformat11 REQUIRED)
754+
find_package(sdformat12 REQUIRED)
755755
find_package(ignition-common4-all REQUIRED)
756756
find_package(ignition-gazebo6-all REQUIRED)
757757
find_package(ignition-math6-all REQUIRED)
758-
find_package(ignition-msgs7-all REQUIRED)
759-
find_package(ignition-physics4-all REQUIRED)
760-
find_package(ignition-sensors5-all REQUIRED)
761-
find_package(ignition-transport10-all REQUIRED)
758+
find_package(ignition-msgs8-all REQUIRED)
759+
find_package(ignition-physics5-all REQUIRED)
760+
find_package(ignition-sensors6-all REQUIRED)
761+
find_package(ignition-transport11-all REQUIRED)
762762
```
763763

764764
In the old code we need only refer to the build configuration retrieved from the Gazebo package:

0 commit comments

Comments
 (0)