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: use gz-cmake4, gz-utils3 #562

Merged
merged 3 commits into from
Oct 13, 2023
Merged

Bumps in ionic: use gz-cmake4, gz-utils3 #562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430f9f6
Bumps in ionic : ci_matching_branch/bump_ionic_gz-math8
azeey Oct 6, 2023
fdc2cfc
Revert version change in comment
azeey Oct 12, 2023
5324dd0
Remove focal CI
azeey Oct 13, 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
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libeigen3-dev
libgz-cmake3-dev
libgz-utils2-dev
libgz-cmake4-dev
libgz-utils3-dev
libpython3-dev
python3-distutils
python3-pybind11
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ project(gz-math8 VERSION 8.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})

#============================================================================
# Configure the project
Expand Down Expand Up @@ -56,8 +56,8 @@ cmake_dependent_option(USE_DIST_PACKAGES_FOR_PYTHON

#--------------------------------------
# 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 eigen3
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math7/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math7)
Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math7-focal-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math7-focal-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math7-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math7-homebrew-amd64)
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math8/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math8)
Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math8-focal-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math8-focal-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math8-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math8-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_math-ci-win)](https://build.osrfoundation.org/job/ign_math-ci-win)

Gazebo Math, a component of [Gazebo](https://gazebosim.org), provides general purpose math
Expand Down
4 changes: 2 additions & 2 deletions src/Quaternion_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ TEST(QuaternionTest, MathAxis)
math::Quaterniond q(GZ_PI*0.1, GZ_PI*0.5, GZ_PI);

GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
// Deprecated in gz-math7
// Deprecated in gz-math8
q.Axis(0, 1, 0, GZ_PI);
EXPECT_EQ(q, math::Quaterniond(6.12303e-17, 0, 1, 0));

// Deprecated in gz-math7
// Deprecated in gz-math8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this comment change, and instead prepare to deprecate the related code

q.Axis(1, 0, 0, GZ_PI);
EXPECT_EQ(q, math::Quaterniond(0, 1, 0, 0));
GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
Expand Down
2 changes: 1 addition & 1 deletion tutorials/angle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This tutorial explains how to use the `Angle` class from Gazebo Math library.
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/cppgetstarted.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int main()
To compile this code on UNIX with pkg-config, use the following command:

```{.bash}
c++ $(pkg-config --cflags gz-math7) main.cpp -o main
c++ $(pkg-config --cflags gz-math8) main.cpp -o main
```

The program can then be run as:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/example_angle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This tutorial explains how to use the `Angle` class from Gazebo Math library.
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/example_triangle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This tutorial explains how to use the `Triangle` class from Gazebo Math library.
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/example_vector2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This tutorial explains how to use the `Vector2` class from Gazebo Math library.
To compile the code, go to `gz-math/examples` and use `cmake`:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/rotation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This example explains how to use quaternions and euler angles, and how to conver
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/rotation_example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This example explains how to use quaternions and euler angles, and how to conver
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/triangle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This tutorial explains how to use the `Triangle` class from Gazebo Math library.
Go to `gz-math/examples` and use `cmake` to compile the code:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion tutorials/vector.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This tutorial explains how to use the `Vector` classes from Gazebo Math library.
To compile the code, go to `gz-math/examples` and use `cmake`:

```{.sh}
git clone https://github.com/gazebosim/gz-math/ -b gz-math7
git clone https://github.com/gazebosim/gz-math/ -b gz-math8
cd gz-math/examples
mkdir build
cd build
Expand Down
Loading