From e43f7610859fdd2fcc89047483044f86f067ca0e Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 27 Oct 2020 21:24:21 -0700 Subject: [PATCH 1/2] Bump in edifice: ign-rendering5 Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 6 +++--- CMakeLists.txt | 12 ++++++------ README.md | 2 +- docker/Dockerfile.nightly | 6 +++--- tutorials/migrating_ardupilot_plugin.md | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 48c14d060a..6ef6992def 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b3647c99d..e9e3c0ce4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 800770fb4f..b28837020c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 6f4d6a7e6b..10bab8a405 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -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 diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index a23dfecf64..f2c5b838da 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -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) ``` From 9bbeae6d89477b2839ccc952344b935915090cc4 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 3 Nov 2020 14:47:51 -0800 Subject: [PATCH 2/2] Update README Signed-off-by: Louise Poubel Co-authored-by: Jose Luis Rivero --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b28837020c..a3a21c553e 100644 --- a/README.md +++ b/README.md @@ -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-gui5-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-sensors5-dev libignition-rendering5-dev libignition-tools-dev libignition-transport9-dev libignition-gui5-dev libignition-msgs6-dev libsdformat10-dev ``` ### Building from source