Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15 #1340

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15 #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
834ca14
Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15
azeey Oct 16, 2023
638ce22
Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15
azeey Oct 16, 2023
399ffcb
Bumps in ionic : ci_matching_branch/bump_ionic_sdformat15
azeey Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions python/test/gz_test_deps/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion python/test/gz_test_deps/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from gz.math7 import *
from gz.math8 import *