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

Bump in edifice: ign-rendering5 #430

Merged
merged 2 commits into from
Nov 3, 2020
Merged

Bump in edifice: ign-rendering5 #430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e43f761
Bump in edifice: ign-rendering5
chapulina Oct 28, 2020
9bbeae6
Update README
chapulina Nov 3, 2020
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
6 changes: 3 additions & 3 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ libfreeimage-dev
libglew-dev
libignition-cmake2-dev
libignition-common3-dev
libignition-gui4-dev
libignition-gui5-dev
libignition-fuel-tools5-dev
libignition-math6-eigen3-dev
libignition-msgs6-dev
libignition-physics3-dev
libignition-plugin-dev
libignition-rendering4-dev
libignition-sensors4-dev
libignition-rendering5-dev
libignition-sensors5-dev
libignition-tools-dev
libignition-transport9-dev
libogre-1.9-dev
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
ign_find_package(ignition-gui4 REQUIRED)
set(IGN_GUI_VER ${ignition-gui4_VERSION_MAJOR})
ign_find_package(ignition-gui5 REQUIRED)
set(IGN_GUI_VER ${ignition-gui5_VERSION_MAJOR})
ign_find_package (Qt5
COMPONENTS
Core
Expand All @@ -97,7 +97,7 @@ set(IGN_PHYSICS_VER ${ignition-physics3_VERSION_MAJOR})

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

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

#--------------------------------------
# Find ignition-math
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ for dependency installation instructions for each supported operating system.
```

```
sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics3-dev libignition-rendering3-dev libignition-tools-dev libignition-transport9-dev libignition-gui4-dev libignition-msgs6-dev libsdformat10-dev
sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics3-dev libignition-rendering3-dev libignition-tools-dev libignition-transport9-dev libignition-gui5-dev libignition-msgs6-dev libsdformat10-dev
```

### Building from source
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ RUN apt-get update \
libignition-math6-eigen3-dev \
libignition-plugin-dev \
libignition-physics3-dev \
libignition-rendering4-dev \
libignition-rendering5-dev \
libignition-tools-dev \
libignition-transport9-dev \
libignition-gui4-dev \
libignition-gui5-dev \
libignition-msgs6-dev \
libignition-sensors4-dev \
libignition-sensors5-dev \
libsdformat10-dev

COPY . ign-gazebo
Expand Down
2 changes: 1 addition & 1 deletion tutorials/migrating_ardupilot_plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ find_package(ignition-gazebo5-all REQUIRED)
find_package(ignition-math6-all REQUIRED)
find_package(ignition-msgs6-all REQUIRED)
find_package(ignition-physics3-all REQUIRED)
find_package(ignition-sensors4-all REQUIRED)
find_package(ignition-sensors5-all REQUIRED)
find_package(ignition-transport9-all REQUIRED)
```

Expand Down