Skip to content

Vendor pkgs migration #55

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Vendor pkgs migration #55

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
15ecaf3
Migrate CMakeLists to work with gz harmonic
Wiktor-99 May 29, 2024
5c66246
Migrate source code to work with gz harmonic
Wiktor-99 May 29, 2024
7662271
Update test worlds
Wiktor-99 May 29, 2024
009d693
Aling readme to gz harmonic
Wiktor-99 May 29, 2024
5dab890
Aling readme to gz harmonic, fix link to gz
Wiktor-99 May 29, 2024
a31e2da
Fix warnings about deprecated functions calls.
Wiktor-99 May 30, 2024
0c7ef0d
Migrate to Ionic
Wiktor-99 Jan 3, 2025
d2d41d6
Merge branch 'main' into ionic
Wiktor-99 Jan 3, 2025
bedaa21
Fix
Wiktor-99 Jan 3, 2025
7d4ee0f
Merge pull request #1 from Wiktor-99/ionic
Wiktor-99 Jan 3, 2025
db6e6e0
Update readme
Wiktor-99 Jan 3, 2025
13f22b7
Use gazebo vendor pkgs
Wiktor-99 Jan 19, 2025
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Key features:

- OS: [Ubuntu 22.04](https://releases.ubuntu.com/jammy/) or [Ubuntu 24.04](https://releases.ubuntu.com/noble/)

- Gazebo: [Harmonic](https://gazebosim.org/docs/harmonic/install)
- Gazebo: [Ionic](https://gazebosim.org/docs/ionic/install/)

- GPU: CUDA-enabled

Expand Down
11 changes: 6 additions & 5 deletions RGLServerPlugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ cmake_minimum_required(VERSION 3.21)
project(RGLServerPlugin)
set(CMAKE_CXX_STANDARD 20)

find_package(gz-cmake3 REQUIRED)
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
find_package(gz-cmake4 REQUIRED)
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})

gz_find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

gz_find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})

include_directories(include)

Expand Down
14 changes: 7 additions & 7 deletions RGLVisualize/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ project(RGLVisualize)

set(CMAKE_AUTOMOC ON)

find_package(gz-cmake3 REQUIRED)
gz_find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
find_package(gz-cmake4 REQUIRED)
gz_find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})

gz_find_package(gz-rendering8 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
gz_find_package(gz-rendering9 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})


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})

QT5_ADD_RESOURCES(resources_RCC RGLVisualize.qrc)

Expand Down
2 changes: 1 addition & 1 deletion RGLVisualize/RGLVisualize.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ void RGLVisualizePrivate::ClearMarkers()
msg.set_id(0);
msg.set_action(gz::msgs::Marker::DELETE_ALL);

igndbg << "Clearing markers on "
gzdbg << "Clearing markers on "
<< this->pointCloudTopic
<< std::endl;

Expand Down