From b85da7899b7fa22be4517e29a142fe46a4629d3e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Tue, 17 Oct 2023 14:00:20 -0500 Subject: [PATCH] Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9 (#936) Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 12 ++++++------ CMakeLists.txt | 20 ++++++++++---------- examples/hello_world_plugin/CMakeLists.txt | 8 ++++---- examples/lux_core_engine/CMakeLists.txt | 2 +- examples/simple_demo_qml/CMakeLists.txt | 4 ++-- tutorials/02_install.md | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 3465e8dd8..08d50ac4d 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,12 +1,12 @@ freeglut3-dev libfreeimage-dev libglew-dev -libgz-cmake3-dev -libgz-common5-dev -libgz-math7-dev -libgz-math7-eigen3-dev -libgz-plugin2-dev -libgz-utils2-dev +libgz-cmake4-dev +libgz-common6-dev +libgz-math8-dev +libgz-math8-eigen3-dev +libgz-plugin3-dev +libgz-utils3-dev libogre-1.9-dev libxi-dev libxmu-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index e842234c7..6d3b1cb5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ project(gz-rendering9 VERSION 9.0.0) # Find gz-cmake #============================================================================ # If you get an error at this line, you need to install gz-cmake -find_package(gz-cmake3 REQUIRED) -set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) +find_package(gz-cmake4 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Set up the project @@ -31,24 +31,24 @@ option(USE_UNOFFICIAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the bui #-------------------------------------- # Find gz-math -gz_find_package(gz-math7 REQUIRED COMPONENTS eigen3) -set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) +gz_find_package(gz-math8 REQUIRED COMPONENTS eigen3) +set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) #-------------------------------------- # Find gz-common -gz_find_package(gz-common5 REQUIRED +gz_find_package(gz-common6 REQUIRED COMPONENTS graphics events geospatial) -set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) +set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) #-------------------------------------- # Find gz-plugin -gz_find_package(gz-plugin2 REQUIRED COMPONENTS all) -set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) +gz_find_package(gz-plugin3 REQUIRED COMPONENTS all) +set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR}) #-------------------------------------- # Find gz-utils -gz_find_package(gz-utils2 REQUIRED) -set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) +gz_find_package(gz-utils3 REQUIRED) +set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find FreeImage diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index 0cad69dd9..cbb653370 100644 --- a/examples/hello_world_plugin/CMakeLists.txt +++ b/examples/hello_world_plugin/CMakeLists.txt @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) find_package(gz-rendering9 REQUIRED) set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR}) -find_package(gz-plugin2 REQUIRED COMPONENTS all) -set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) +find_package(gz-plugin3 REQUIRED COMPONENTS all) +set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR}) -find_package(gz-common5 REQUIRED) -set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) +find_package(gz-common6 REQUIRED) +set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc) target_link_libraries(HelloWorldPlugin diff --git a/examples/lux_core_engine/CMakeLists.txt b/examples/lux_core_engine/CMakeLists.txt index b05571fcc..a9a544ff3 100644 --- a/examples/lux_core_engine/CMakeLists.txt +++ b/examples/lux_core_engine/CMakeLists.txt @@ -4,7 +4,7 @@ set(GZ_PLUGIN_VER 2) set(GZ_COMMON_VER 5) find_package(gz-rendering7 REQUIRED) -find_package(gz-plugin2 REQUIRED COMPONENTS all) +find_package(gz-plugin3 REQUIRED COMPONENTS all) if (NOT DEFINED ENV{LUXCORE_SDK_PATH}) message(FATAL_ERROR "Must define LUXCORE_SDK_PATH") diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt index 59c9b3d92..cd8cc4640 100644 --- a/examples/simple_demo_qml/CMakeLists.txt +++ b/examples/simple_demo_qml/CMakeLists.txt @@ -3,8 +3,8 @@ project(gz-rendering-simple-demo-qml) #------------------------------------------------------------------------ # Find gz-cmake -find_package(gz-cmake3 REQUIRED) -set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) +find_package(gz-cmake4 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #------------------------------------------------------------------------ # Find gz-rendering diff --git a/tutorials/02_install.md b/tutorials/02_install.md index a5beb4118..cd8ffed3e 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -57,10 +57,10 @@ sudo apt install -y \ freeglut3-dev \ libxmu-dev \ libxi-dev \ - libgz-cmake3-dev \ - libgz-math7-dev \ - libgz-common5-dev \ - libgz-plugin2-dev + libgz-cmake4-dev \ + libgz-math8-dev \ + libgz-common6-dev \ + libgz-plugin3-dev ``` ### Supported Rendering Engines