Skip to content

Commit

Permalink
Update package deps for harmonic (#326)
Browse files Browse the repository at this point in the history
Now that msgs and transport are recently bumped (to msgs10 and transport13) in harmonic, we need to bump all packages that depend on them. In this case, harmonic should now use fuel-tools9.

I noticed that the package dependency versions were bumped in main in 83077ca. Here I'm just updating all of them to correspond to the correct gz package versions that we currently use in harmonic

Signed-off-by: Ian Chen <ichen@openrobotics.org>
  • Loading branch information
iche033 authored Feb 13, 2023
1 parent b68ca8e commit 0b36586
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ libgflags-dev
libgz-cmake3-dev
libgz-common5-dev
libgz-math7-dev
libgz-msgs9-dev
libgz-msgs10-dev
libgz-tools2-dev
libgz-utils2-dev
libjsoncpp-dev
Expand Down
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ project(gz-fuel_tools9 VERSION 9.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-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})

#============================================================================
# Configure the project
Expand Down Expand Up @@ -49,18 +49,18 @@ gz_find_package(ZIP REQUIRED PRIVATE)

#--------------------------------------
# Find gz-utils
gz_find_package(gz-utils3 REQUIRED)
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})

#--------------------------------------
# Find gz-common
gz_find_package(gz-common6 REQUIRED PRIVATE)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
gz_find_package(gz-common5 REQUIRED PRIVATE)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})

#--------------------------------------
# Find gz-math
gz_find_package(gz-math8 REQUIRED PRIVATE)
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
gz_find_package(gz-math7 REQUIRED PRIVATE)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})

#--------------------------------------
# Find gz-msgs
Expand Down
2 changes: 1 addition & 1 deletion tutorials/01_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ sudo apt-get remove libgz-fuel-tools<#>-dev
Install prerequisites. A clean Ubuntu system will need:

```
sudo apt-get install git cmake pkg-config python ruby-ronn libgz-cmake3-dev libgz-common5-dev libgz-math7-dev libgz-msgs9-dev libgz-tools2-dev libzip-dev libjsoncpp-dev libcurl4-openssl-dev libyaml-dev
sudo apt-get install git cmake pkg-config python ruby-ronn libgz-cmake3-dev libgz-common5-dev libgz-math7-dev libgz-msgs10-dev libgz-tools2-dev libzip-dev libjsoncpp-dev libcurl4-openssl-dev libyaml-dev
```

Clone the repository into a directory and go into it:
Expand Down

0 comments on commit 0b36586

Please sign in to comment.