Bump gz-cmake and others in jetty (#1131)

scpeters · web-flow · commit 72a82eb55263 · 2025-05-02T13:55:27.000-07:00
Bumping gz-cmake and others except gz-tools.

* Disable Jammy CI
* windows.yaml: install cli11
* Fix windows workflow configuration

Rename the PACKAGE variable to PACKAGE_WITH_VERSION
and compute PACKAGE by removing digits.

Signed-off-by: Steve Peters &lt;scpeters@openrobotics.org&gt;
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,12 +1,12 @@
 freeglut3-dev
 libfreeimage-dev
 libglew-dev
-libgz-cmake4-dev
-libgz-common6-dev
-libgz-math8-dev
-libgz-math8-eigen3-dev
-libgz-plugin3-dev
-libgz-utils3-dev
+libgz-cmake5-dev
+libgz-common7-dev
+libgz-math9-dev
+libgz-math9-eigen3-dev
+libgz-plugin4-dev
+libgz-utils4-dev
 libogre-1.9-dev
 libxi-dev
 libxmu-dev
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,18 +9,6 @@ on:
       - 'main'
 
 jobs:
-  jammy-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Jammy CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Compile and test
-        id: ci
-        uses: gazebo-tooling/action-gz-ci@jammy
-        with:
-          codecov-enabled: true
-          doxygen-enabled: true
   noble-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Noble CI
@@ -31,5 +19,7 @@ jobs:
         id: ci
         uses: gazebo-tooling/action-gz-ci@noble
         with:
+          # codecov-enabled: true
           cppcheck-enabled: true
           cpplint-enabled: true
+          # doxygen-enabled: true
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: Window CI
     env:
-      PACKAGE: gz-rendering10
+      PACKAGE_WITH_VERSION: gz-rendering10
     runs-on: windows-latest
     steps:
     - name: setup-pixi
@@ -26,12 +26,16 @@ jobs:
     - name: Install base dependencies
       run: |
         # List adapted from https://github.com/gazebo-tooling/release-tools/blob/f89ac8cafc646260598eb8eb6d94be8093bdc9f7/jenkins-scripts/lib/windows_env_vars.bat#L22
-        pixi add assimp dlfcn-win32 eigen ffmpeg freeimage gdal gflags ogre ogre-next spdlog tinyxml2
+        pixi add assimp cli11 dlfcn-win32 eigen ffmpeg freeimage gdal gflags ogre ogre-next spdlog tinyxml2
     - name: Clone source dependencies
       run: |
         mkdir src
         cd src
-        pixi run vcs import --input https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/${env:PACKAGE}.yaml
+        pixi run vcs import --input https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/${env:PACKAGE_WITH_VERSION}.yaml
+
+    - name: Set PACKAGE variable without version
+      shell: bash
+      run: echo "PACKAGE=${PACKAGE_WITH_VERSION//[[:digit:]]/}" >> $GITHUB_ENV
 
     - uses: actions/checkout@v4
       with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,14 +3,13 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-rendering10 VERSION 10.0.0)
+project(gz-rendering VERSION 10.0.0)
 
 #============================================================================
 # Find gz-cmake
 #============================================================================
 # If you get an error at this line, you need to install gz-cmake
-find_package(gz-cmake4 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
+find_package(gz-cmake REQUIRED)
 
 #============================================================================
 # Set up the project
@@ -31,24 +30,20 @@ option(USE_UNOFFICIAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the bui
 
 #--------------------------------------
 # Find gz-math
-gz_find_package(gz-math8 REQUIRED COMPONENTS eigen3)
-set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
+gz_find_package(gz-math REQUIRED COMPONENTS eigen3)
 
 #--------------------------------------
 # Find gz-common
-gz_find_package(gz-common6 REQUIRED
+gz_find_package(gz-common REQUIRED
   COMPONENTS graphics events geospatial)
-set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-plugin
-gz_find_package(gz-plugin3 REQUIRED COMPONENTS all)
-set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
+gz_find_package(gz-plugin REQUIRED COMPONENTS all)
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils3 REQUIRED)
-set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
+gz_find_package(gz-utils REQUIRED)
 
 #--------------------------------------
 # Find OpenGL
diff --git a/doc/ogre_1-9.tag.xml.tgz b/doc/ogre_1-9.tag.xml.tgz
diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-actor-animation)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/boundingbox_camera/CMakeLists.txt b/examples/boundingbox_camera/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-boundingbox-camera)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-camera-tracking)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/custom_scene_viewer/CMakeLists.txt b/examples/custom_scene_viewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-custom-scene-viewer)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
 )
 
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/custom_shaders_uniforms/CMakeLists.txt b/examples/custom_shaders_uniforms/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
 )
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")
 
diff --git a/examples/depth_camera/CMakeLists.txt b/examples/depth_camera/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-depth-camera)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/frustum_visual/CMakeLists.txt b/examples/frustum_visual/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-frustum-visual)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/global_illumination/CMakeLists.txt b/examples/global_illumination/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-global_illumination)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-heightmap)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt
@@ -1,19 +1,16 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
-find_package(gz-rendering10 REQUIRED)
-set(GZ_RENDERING_VER ${gz-rendering10_VERSION_MAJOR})
+find_package(gz-rendering REQUIRED)
 
-find_package(gz-plugin3 REQUIRED COMPONENTS all)
-set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
+find_package(gz-plugin REQUIRED COMPONENTS all)
 
-find_package(gz-common6 REQUIRED)
-set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
+find_package(gz-common REQUIRED)
 
 add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
 target_link_libraries(HelloWorldPlugin
   PUBLIC
-    gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
-    gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
+    gz-rendering::gz-rendering
+    gz-common::gz-common
   PRIVATE
-    gz-plugin${GZ_PLUGIN_VER}::register
+    gz-plugin::register
 )
diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-lidar_visual)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/lux_core_engine/CMakeLists.txt b/examples/lux_core_engine/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 set(GZ_PLUGIN_VER 2)
 set(GZ_COMMON_VER 5)
 
-find_package(gz-rendering10 REQUIRED)
-find_package(gz-plugin3 REQUIRED COMPONENTS all)
+find_package(gz-rendering REQUIRED)
+find_package(gz-plugin REQUIRED COMPONENTS all)
 
 if (NOT DEFINED ENV{LUXCORE_SDK_PATH})
   message(FATAL_ERROR "Must define LUXCORE_SDK_PATH")
@@ -30,11 +30,11 @@ add_library(LuxCoreEngine SHARED
 
 target_link_libraries(LuxCoreEngine
   PUBLIC
-    ${gz-common${GZ_COMMON_VER}_LIBRARIES}
+    ${gz-common_LIBRARIES}
     ${GZ-RENDERING_LIBRARIES}
     ${LUXCORE_LIBRARY}
   PRIVATE
-    gz-plugin${GZ_PLUGIN_VER}::register
+    gz-plugin::register
 )
 
 find_package(GLUT REQUIRED)
diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-mesh-viewer)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-mouse-picking)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-ogre2-demo)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-particles-demo)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/projector/CMakeLists.txt b/examples/projector/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-projector)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
@@ -30,8 +30,8 @@ target_link_libraries(projector
   ${GLUT_LIBRARIES}
   ${OPENGL_LIBRARIES}
   ${GLEW_LIBRARIES}
-  gz-rendering10::gz-rendering10
-  gz-rendering10::core
+  gz-rendering::gz-rendering
+  gz-rendering::core
 )
 
 add_custom_command(TARGET projector POST_BUILD
diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-render-pass)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/segmentation_camera/CMakeLists.txt b/examples/segmentation_camera/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-segmentation-camera)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-simple-demo)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt
@@ -3,12 +3,11 @@ project(gz-rendering-simple-demo-qml)
 
 #------------------------------------------------------------------------
 # Find gz-cmake
-find_package(gz-cmake4 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
+find_package(gz-cmake REQUIRED)
 
 #------------------------------------------------------------------------
 # Find gz-rendering
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 #======================================
 # Find Qt
diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-text-geom)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-thermal-camera)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-transform-control)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-view-control)
-find_package(gz-rendering10 REQUIRED)
+find_package(gz-rendering REQUIRED)
 
 find_package(GLUT REQUIRED)
 include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
diff --git a/examples/visualization_demo/CMakeLists.txt b/examples/visualization_demo/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-visualization-demo)
 
-find_package(gz-rendering10)
+find_package(gz-rendering)
 
 if (APPLE OR UNIX)
   find_package(GLUT REQUIRED)
diff --git a/examples/waves/CMakeLists.txt b/examples/waves/CMakeLists.txt
diff --git a/examples/wide_angle_camera/CMakeLists.txt b/examples/wide_angle_camera/CMakeLists.txt
diff --git a/ogre/src/CMakeLists.txt b/ogre/src/CMakeLists.txt
diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt
diff --git a/optix/src/CMakeLists.txt b/optix/src/CMakeLists.txt
diff --git a/package.xml b/package.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/test/common_test/CMakeLists.txt b/test/common_test/CMakeLists.txt
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
diff --git a/test/regression/CMakeLists.txt b/test/regression/CMakeLists.txt
diff --git a/tutorials/02_install.md b/tutorials/02_install.md

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ include_directories(SYSTEM`
`5`	`5`	`${PROJECT_BINARY_DIR}`
`6`	`6`	`)`
`7`	`7`
`8`		`-find_package(gz-rendering10 REQUIRED)`
	`8`	`+find_package(gz-rendering REQUIRED)`
`9`	`9`
`10`	`10`	`find_package(GLUT REQUIRED)`
`11`	`11`	`include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})`