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.

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_gz-launch8 #237

Merged
merged 5 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
binutils-dev
libgflags-dev
libgz-cmake3-dev
libgz-common5-dev
libgz-fuel-tools9-dev
libgz-sim8-dev
libgz-gui8-dev
libgz-math7-dev
libgz-math7-eigen3-dev
libgz-msgs10-dev
libgz-physics7-dev
libgz-plugin2-dev
libgz-rendering8-dev
libgz-sensors8-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-fuel-tools10-dev
libgz-sim9-dev
libgz-gui9-dev
libgz-math8-dev
libgz-math8-eigen3-dev
libgz-msgs11-dev
libgz-physics8-dev
libgz-plugin3-dev
libgz-rendering9-dev
libgz-sensors9-dev
libgz-tools2-dev
libgz-transport13-dev
libsdformat14-dev
libgz-transport14-dev
libsdformat15-dev
libtinyxml2-dev
libwebsockets-dev
libxi-dev
Expand Down
36 changes: 18 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ project(gz-launch8 VERSION 8.0.0)
#============================================================================
# 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})

#============================================================================
# Configure the project
Expand All @@ -36,18 +36,18 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)

#--------------------------------------
# Find gz-common
gz_find_package(gz-common5 REQUIRED PRIVATE)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
gz_find_package(gz-common6 REQUIRED PRIVATE)
set(GZ_COMMON_VER ${gz-common6_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})

#--------------------------------------
# Find gz-plugin
gz_find_package(gz-plugin2 REQUIRED_BY launch COMPONENTS loader register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
gz_find_package(gz-plugin3 REQUIRED_BY launch COMPONENTS loader register)
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})

#--------------------------------------
# Find if gz command is available
Expand All @@ -61,23 +61,23 @@ set(GZ_TOOLS_VER 2)

#--------------------------------------
# Find gz-transport
gz_find_package(gz-transport13 REQUIRED)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
gz_find_package(gz-transport14 REQUIRED)
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})

#--------------------------------------
# Find gz-msgs
gz_find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
gz_find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})

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

#--------------------------------------
# Find gz-gui
gz_find_package(gz-gui8 REQUIRED)
set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
gz_find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
gz_find_package (Qt5
COMPONENTS
Core
Expand All @@ -88,8 +88,8 @@ gz_find_package (Qt5

#--------------------------------------
# Find gz-sim
gz_find_package(gz-sim8 REQUIRED PRIVATE COMPONENTS gui)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
gz_find_package(gz-sim9 REQUIRED PRIVATE COMPONENTS gui)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

gz_pkg_check_modules(websockets libwebsockets)
if (NOT websockets_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion tutorials/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ necessary prerequisites followed by building from source.
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install libgz-cmake3-dev libgz-sim2-dev
sudo apt-get -y install libgz-cmake4-dev libgz-sim9-dev
```

### Building from source
Expand Down