Merge 399ffcb into 5851546

gazebosim · Oct 16, 2023 · 8853d21 · 8853d21
2 parents 5851546 + 399ffcb
commit 8853d21
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,14 +1,14 @@
-libgz-cmake3-dev
-libgz-math7-dev
+libgz-cmake4-dev
+libgz-math8-dev
 libgz-tools2-dev
-libgz-utils2-dev
-libgz-utils2-cli-dev
+libgz-utils3-dev
+libgz-utils3-cli-dev
 libtinyxml2-dev
 liburdfdom-dev
 libxml2-utils
 python3-dev
 python3-distutils
-python3-gz-math7
+python3-gz-math8
 python3-psutil
 python3-pybind11
 python3-pytest
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,8 +18,8 @@ set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE)
 
 #################################################
 # 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})
 
 ########################################
 option(SKIP_PYBIND11
@@ -113,13 +113,13 @@ if (BUILD_SDF)
   ########################################
   # Find gz math
   # Set a variable for generating ProjectConfig.cmake
-  gz_find_package(gz-math7 VERSION REQUIRED)
-  set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
+  gz_find_package(gz-math8 VERSION REQUIRED)
+  set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
 
   ########################################
   # Find gz utils
-  gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
-  set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+  gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
+  set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
   ########################################
   # Python interfaces

diff --git a/python/test/gz_test_deps/README b/python/test/gz_test_deps/README
@@ -3,6 +3,6 @@ bindings such that the version number only has to be changed in this package.
 Here's an example of how to use this in a python test:
 
 ```python
-from gz_test_deps import math  # instead of from gz import math7
-from gz_test_deps.math import Vector3d  # instead of from gz.math7 import Vector3d
+from gz_test_deps import math  # instead of from gz import math8
+from gz_test_deps.math import Vector3d  # instead of from gz.math8 import Vector3d
 ```
diff --git a/python/test/gz_test_deps/math.py b/python/test/gz_test_deps/math.py
@@ -1 +1 @@
-from gz.math7 import *
+from gz.math8 import *