Skip to content
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

Bumps in fortress : ign-gazebo6 #764

Merged
merged 2 commits into from
Apr 17, 2021
Merged

Bumps in fortress : ign-gazebo6 #764

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
5426f21
Bumps in fortress : ign-gazebo6
chapulina Apr 13, 2021
113e100
fuel7 transport11
chapulina Apr 17, 2021
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
16 changes: 8 additions & 8 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ libfreeimage-dev
libglew-dev
libignition-cmake2-dev
libignition-common4-dev
libignition-gui5-dev
libignition-fuel-tools6-dev
libignition-gui6-dev
libignition-fuel-tools7-dev
libignition-math6-eigen3-dev
libignition-msgs7-dev
libignition-physics4-dev
libignition-msgs8-dev
libignition-physics5-dev
libignition-plugin-dev
libignition-rendering5-dev
libignition-sensors5-dev
libignition-rendering6-dev
libignition-sensors6-dev
libignition-tools-dev
libignition-transport10-dev
libignition-transport11-dev
libignition-utils1-cli-dev
libogre-1.9-dev
libogre-2.1-dev
libprotobuf-dev
libprotoc-dev
libsdformat11-dev
libsdformat12-dev
libtinyxml2-dev
libxi-dev
libxmu-dev
Expand Down
34 changes: 17 additions & 17 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ endif()
# Search for project-specific dependencies
#============================================================================

ign_find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})
ign_find_package(sdformat12 REQUIRED)
set(SDF_VER ${sdformat12_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
Expand All @@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

#--------------------------------------
# Find ignition-transport
ign_find_package(ignition-transport10 REQUIRED COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
ign_find_package(ignition-transport11 REQUIRED COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

#--------------------------------------
# Find ignition-msgs
ign_find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
ign_find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

#--------------------------------------
# Find ignition-common
Expand All @@ -70,13 +70,13 @@ set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})

#--------------------------------------
# Find ignition-fuel_tools
ign_find_package(ignition-fuel_tools6 REQUIRED)
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools6_VERSION_MAJOR})
ign_find_package(ignition-fuel_tools7 REQUIRED)
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
ign_find_package(ignition-gui5 REQUIRED)
set(IGN_GUI_VER ${ignition-gui5_VERSION_MAJOR})
ign_find_package(ignition-gui6 REQUIRED)
set(IGN_GUI_VER ${ignition-gui6_VERSION_MAJOR})
ign_find_package (Qt5
COMPONENTS
Core
Expand All @@ -87,17 +87,17 @@ ign_find_package (Qt5

#--------------------------------------
# Find ignition-physics
ign_find_package(ignition-physics4
ign_find_package(ignition-physics5
COMPONENTS
mesh
sdf
REQUIRED
)
set(IGN_PHYSICS_VER ${ignition-physics4_VERSION_MAJOR})
set(IGN_PHYSICS_VER ${ignition-physics5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-sensors
ign_find_package(ignition-sensors5 REQUIRED
ign_find_package(ignition-sensors6 REQUIRED
COMPONENTS
rendering
air_pressure
Expand All @@ -110,12 +110,12 @@ ign_find_package(ignition-sensors5 REQUIRED
depth_camera
thermal_camera
)
set(IGN_SENSORS_VER ${ignition-sensors5_VERSION_MAJOR})
set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-rendering
ign_find_package(ignition-rendering5 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR})
ign_find_package(ignition-rendering6 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-math
Expand Down Expand Up @@ -143,7 +143,7 @@ ign_find_package(IgnProtobuf
REQUIRED
COMPONENTS all
PRETTY Protobuf)
set(Protobuf_IMPORT_DIRS ${ignition-msgs7_INCLUDE_DIRS})
set(Protobuf_IMPORT_DIRS ${ignition-msgs8_INCLUDE_DIRS})

# Plugin install dirs
set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ line is using symbolic links to each library's YAML file.
```
mkdir ~/.ignition/tools/configs -p
cd ~/.ignition/tools/configs/
ln -s /usr/local/share/ignition/fuel6.yaml .
ln -s /usr/local/share/ignition/transport10.yaml .
ln -s /usr/local/share/ignition/transportlog10.yaml .
ln -s /usr/local/share/ignition/fuel7.yaml .
ln -s /usr/local/share/ignition/transport11.yaml .
ln -s /usr/local/share/ignition/transportlog11.yaml .
...
export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
```
Expand Down
4 changes: 2 additions & 2 deletions bitbucket-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipelines:
libignition-transport8-dev
libsdformat9-dev
libignition-fuel-tools4-dev
libignition-physics4-dev
libignition-physics5-dev
# libignition-common4-dev
# libignition-gui3-dev
# libignition-sensors3-dev
Expand Down Expand Up @@ -78,7 +78,7 @@ pipelines:
libignition-tools-dev
# libignition-fuel-tools4-dev
# libignition-physics2-dev
# libsdformat11-dev
# libsdformat12-dev
# libignition-gui3-dev
# libignition-msgs5-dev
# libignition-rendering3-dev
Expand Down
16 changes: 8 additions & 8 deletions docker/Dockerfile.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ RUN apt-get update \
&& apt-get install -y \
libignition-cmake2-dev \
libignition-common4-dev \
libignition-fuel-tools6-dev \
libignition-fuel-tools7-dev \
libignition-math6-eigen3-dev \
libignition-plugin-dev \
libignition-physics4-dev \
libignition-rendering5-dev \
libignition-physics5-dev \
libignition-rendering6-dev \
libignition-tools-dev \
libignition-transport10-dev \
libignition-gui5-dev \
libignition-msgs7-dev \
libignition-sensors5-dev \
libsdformat11-dev
libignition-transport11-dev \
libignition-gui6-dev \
libignition-msgs8-dev \
libignition-sensors6-dev \
libsdformat12-dev

COPY . ign-gazebo
RUN cd ign-gazebo \
Expand Down
10 changes: 5 additions & 5 deletions examples/plugin/rendering_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ endif()
project(RenderingPlugins)

# Common to both plugins
find_package(ignition-rendering5 REQUIRED)
find_package(ignition-rendering6 REQUIRED)

# GUI plugin
set(GUI_PLUGIN RenderingGuiPlugin)

set(CMAKE_AUTOMOC ON)

find_package(ignition-gui5 REQUIRED)
find_package(ignition-gui6 REQUIRED)

QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)

Expand All @@ -24,8 +24,8 @@ add_library(${GUI_PLUGIN} SHARED
)
target_link_libraries(${GUI_PLUGIN}
PRIVATE
ignition-gui5::ignition-gui5
ignition-rendering5::ignition-rendering5
ignition-gui6::ignition-gui6
ignition-rendering6::ignition-rendering6
)

# Server plugin
Expand All @@ -40,5 +40,5 @@ target_link_libraries(${SERVER_PLUGIN}
PRIVATE
ignition-plugin1::ignition-plugin1
ignition-gazebo6::ignition-gazebo6
ignition-rendering5::ignition-rendering5
ignition-rendering6::ignition-rendering6
)
4 changes: 2 additions & 2 deletions examples/standalone/entity_creation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

add_executable(entity_creation entity_creation.cc)
target_link_libraries(entity_creation
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/joy_to_twist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})
find_package(sdformat12 REQUIRED)
set(SDF_VER ${sdformat12_VERSION_MAJOR})

add_executable(joy_to_twist joy_to_twist.cc)
target_link_libraries(joy_to_twist
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/joystick/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
# joystick currently works only on linux

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

find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})
find_package(sdformat12 REQUIRED)
set(SDF_VER ${sdformat12_VERSION_MAJOR})

add_executable(joystick joystick.cc)
target_link_libraries(joystick
Expand Down
12 changes: 6 additions & 6 deletions examples/standalone/keyboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})
find_package(sdformat12 REQUIRED)
set(SDF_VER ${sdformat12_VERSION_MAJOR})

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

find_package(ignition-common4 REQUIRED)
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/light_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

find_package(ignition-gazebo6 REQUIRED)
set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/marker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

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

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

add_executable(marker marker.cc)
target_link_libraries(marker
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/scene_requester/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

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

add_executable(scene_requester scene_requester.cc)
target_link_libraries(scene_requester
Expand Down
10 changes: 5 additions & 5 deletions tutorials/migrating_ardupilot_plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,14 +751,14 @@ In the new code we explicitly reference each Ignition package that we use:

```
# NEW
find_package(sdformat11 REQUIRED)
find_package(sdformat12 REQUIRED)
find_package(ignition-common4-all REQUIRED)
find_package(ignition-gazebo6-all REQUIRED)
find_package(ignition-math6-all REQUIRED)
find_package(ignition-msgs7-all REQUIRED)
find_package(ignition-physics4-all REQUIRED)
find_package(ignition-sensors5-all REQUIRED)
find_package(ignition-transport10-all REQUIRED)
find_package(ignition-msgs8-all REQUIRED)
find_package(ignition-physics5-all REQUIRED)
find_package(ignition-sensors6-all REQUIRED)
find_package(ignition-transport11-all REQUIRED)
```

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