From 29823c79fa313c67ee50ec6589a656e60f2667a1 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 27 Oct 2020 21:41:18 -0700 Subject: [PATCH] Bump in edifice: ign-rendering5 Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 8 ++++---- CMakeLists.txt | 8 ++++---- bitbucket-pipelines.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 9e11116f..d2526d00 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -3,15 +3,15 @@ libgflags-dev libignition-cmake2-dev libignition-common3-dev libignition-fuel-tools5-dev -libignition-gazebo4-dev -libignition-gui4-dev +libignition-gazebo5-dev +libignition-gui5-dev libignition-math6-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 libsdformat10-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 91fcede5..b32da0ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,8 @@ set(IGN_MATH_MAJOR_VER ${ignition-math6_VERSION_MAJOR}) #-------------------------------------- # Find ignition-gui -ign_find_package(ignition-gui4 REQUIRED) -set(IGN_GUI_MAJOR_VER ${ignition-gui4_VERSION_MAJOR}) +ign_find_package(ignition-gui5 REQUIRED) +set(IGN_GUI_MAJOR_VER ${ignition-gui5_VERSION_MAJOR}) ign_find_package (Qt5 COMPONENTS Core @@ -79,8 +79,8 @@ ign_find_package (Qt5 #-------------------------------------- # Find ignition-gazebo -ign_find_package(ignition-gazebo4 REQUIRED PRIVATE COMPONENTS gui) -set(IGN_GAZEBO_MAJOR_VER ${ignition-gazebo4_VERSION_MAJOR}) +ign_find_package(ignition-gazebo5 REQUIRED PRIVATE COMPONENTS gui) +set(IGN_GAZEBO_MAJOR_VER ${ignition-gazebo5_VERSION_MAJOR}) ign_pkg_check_modules(websockets libwebsockets) if (NOT websockets_FOUND) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 4e328db5..7d3ea25c 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -37,10 +37,10 @@ pipelines: libignition-tools-dev libignition-transport9-dev libsdformat10-dev - # libignition-gazebo4-dev - # libignition-gui4-dev - # libignition-rendering4-dev - # libignition-sensors4-dev + # libignition-gazebo5-dev + # libignition-gui5-dev + # libignition-rendering5-dev + # libignition-sensors5-dev # # Ignition msgs (uncomment if a specific branch is needed) # - apt install -y # libprotobuf-dev protobuf-compiler libprotoc-dev