From cbe219eee208ec4eac8645c07b6aac0dff563983 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:33:50 -0500 Subject: [PATCH 1/4] Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 8 ++++---- examples/hello_world_plugin/CMakeLists.txt | 4 ++-- examples/simple_demo_qml/CMakeLists.txt | 4 ++-- tutorials/02_install.md | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 3465e8dd8..0bad7dce1 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,8 +1,8 @@ freeglut3-dev libfreeimage-dev libglew-dev -libgz-cmake3-dev -libgz-common5-dev +libgz-cmake4-dev +libgz-common6-dev libgz-math7-dev libgz-math7-eigen3-dev libgz-plugin2-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index e842234c7..d9c57f391 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 @@ -36,9 +36,9 @@ set(GZ_MATH_VER ${gz-math7_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 diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index 0cad69dd9..3393fd4e8 100644 --- a/examples/hello_world_plugin/CMakeLists.txt +++ b/examples/hello_world_plugin/CMakeLists.txt @@ -6,8 +6,8 @@ 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-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/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..0c46754fe 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -57,9 +57,9 @@ sudo apt install -y \ freeglut3-dev \ libxmu-dev \ libxi-dev \ - libgz-cmake3-dev \ + libgz-cmake4-dev \ libgz-math7-dev \ - libgz-common5-dev \ + libgz-common6-dev \ libgz-plugin2-dev ``` From b8b4fb5de4ddcaee6f802272dce1cf950e5bdd1b Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:55:02 -0500 Subject: [PATCH 2/4] Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 0bad7dce1..030efc17c 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -6,7 +6,7 @@ libgz-common6-dev libgz-math7-dev libgz-math7-eigen3-dev libgz-plugin2-dev -libgz-utils2-dev +libgz-utils3-dev libogre-1.9-dev libxi-dev libxmu-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index d9c57f391..115b36562 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,8 @@ set(GZ_PLUGIN_VER ${gz-plugin2_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 From 48a4c0abd3ec547669fb9b79cb936e65b8d17862 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 18:03:52 -0500 Subject: [PATCH 3/4] Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 4 ++-- tutorials/02_install.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 030efc17c..fc2bb6396 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -3,8 +3,8 @@ libfreeimage-dev libglew-dev libgz-cmake4-dev libgz-common6-dev -libgz-math7-dev -libgz-math7-eigen3-dev +libgz-math8-dev +libgz-math8-eigen3-dev libgz-plugin2-dev libgz-utils3-dev libogre-1.9-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 115b36562..1272857ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,8 +31,8 @@ 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 diff --git a/tutorials/02_install.md b/tutorials/02_install.md index 0c46754fe..681c4a1ae 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -58,7 +58,7 @@ sudo apt install -y \ libxmu-dev \ libxi-dev \ libgz-cmake4-dev \ - libgz-math7-dev \ + libgz-math8-dev \ libgz-common6-dev \ libgz-plugin2-dev ``` From 8402b2e39d45df829990cb088f06798b0bb0142e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 18:11:53 -0500 Subject: [PATCH 4/4] Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- examples/hello_world_plugin/CMakeLists.txt | 4 ++-- examples/lux_core_engine/CMakeLists.txt | 2 +- tutorials/02_install.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index fc2bb6396..08d50ac4d 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -5,7 +5,7 @@ libgz-cmake4-dev libgz-common6-dev libgz-math8-dev libgz-math8-eigen3-dev -libgz-plugin2-dev +libgz-plugin3-dev libgz-utils3-dev libogre-1.9-dev libxi-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 1272857ee..6d3b1cb5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,8 +42,8 @@ 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 diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index 3393fd4e8..cbb653370 100644 --- a/examples/hello_world_plugin/CMakeLists.txt +++ b/examples/hello_world_plugin/CMakeLists.txt @@ -3,8 +3,8 @@ 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-common6 REQUIRED) set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) 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/tutorials/02_install.md b/tutorials/02_install.md index 681c4a1ae..cd8ffed3e 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -60,7 +60,7 @@ sudo apt install -y \ libgz-cmake4-dev \ libgz-math8-dev \ libgz-common6-dev \ - libgz-plugin2-dev + libgz-plugin3-dev ``` ### Supported Rendering Engines