From f10630ca2050bc266ae6a421d546aef91ea3983c Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 14 Nov 2022 15:10:34 -0800 Subject: [PATCH 1/2] bump to use rendering8 Signed-off-by: Ian Chen --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76cdb459..a0a6f966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,8 +69,8 @@ if ((NOT ${CMAKE_VERSION} VERSION_LESS 3.11) AND (NOT OpenGL_GL_PREFERENCE)) set(OpenGL_GL_PREFERENCE "GLVND") endif() -gz_find_package(gz-rendering7 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) -set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR}) +gz_find_package(gz-rendering8 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) +set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR}) if (TARGET gz-rendering${GZ_RENDERING_VER}::ogre) set(HAVE_OGRE TRUE) From d6f85f07256f1f4d00a449c7f27b2e136093e7e6 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 14 Nov 2022 15:15:17 -0800 Subject: [PATCH 2/2] bump to use rendering8 Signed-off-by: Ian Chen --- .github/ci/packages.apt | 2 +- examples/save_image/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 469eba9b..ef89ab5e 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -2,7 +2,7 @@ libgz-cmake3-dev libgz-common5-dev libgz-math7-dev libgz-msgs9-dev -libgz-rendering7-dev +libgz-rendering8-dev libgz-tools2-dev libgz-transport12-dev libsdformat13-dev diff --git a/examples/save_image/CMakeLists.txt b/examples/save_image/CMakeLists.txt index 5ae84bf7..f36b0087 100644 --- a/examples/save_image/CMakeLists.txt +++ b/examples/save_image/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(gz-sensors-camera-demo) # Find the Gazebo Libraries used directly by the example -find_package(gz-rendering7 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) +find_package(gz-rendering8 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) find_package(gz-sensors8 REQUIRED COMPONENTS rendering camera) -if (TARGET gz-rendering7::ogre) +if (TARGET gz-rendering8::ogre) add_definitions(-DWITH_OGRE) endif() -if (TARGET gz-rendering7::ogre2) +if (TARGET gz-rendering8::ogre2) add_definitions(-DWITH_OGRE2) endif()