Merge a1289bb into 920751a

gazebosim · Dec 8, 2022 · 5b86b66 · 5b86b66
2 parents 920751a + a1289bb
commit 5b86b66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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/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)

diff --git 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()