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

Add gazebo garden support to ROS Noetic #484

Draft
wants to merge 8 commits into
base: noetic
Choose a base branch
from
Draft

Add gazebo garden support to ROS Noetic #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0c2656
Supporting gazebo garden
Tuxliri Jan 6, 2024
acc25c3
Update CMakeLists.txt to support Gazebo Garden
Tuxliri Jan 6, 2024
caa2f75
Update CMakeLists.txt for Gazebo Garden
Tuxliri Jan 6, 2024
de0db1c
Fixing unclosed if
Tuxliri Jan 6, 2024
e85f2d4
Updated dependencies in package.xml
Tuxliri Jan 6, 2024
c0a97cf
Updated dependencies
Tuxliri Jan 6, 2024
df3cbec
Updating dependencies
Tuxliri Jan 7, 2024
4de4131
Fixing more dependencies
Tuxliri Jan 7, 2024
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
11 changes: 10 additions & 1 deletion ros_ign_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,18 @@ find_package(catkin REQUIRED COMPONENTS
std_msgs
tf2_msgs
visualization_msgs)
# Garden
if ("$ENV{IGNITION_VERSION}" STREQUAL "garden")
find_package(gz-transport12 REQUIRED)
set(IGN_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})

find_package(gz-msgs9 REQUIRED)
set(IGN_MSGS_VER ${gz-msgs9_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Garden")

# Fortress
if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
elseif ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

Expand Down
3 changes: 3 additions & 0 deletions ros_ign_bridge/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<depend>tf2_msgs</depend>
<depend>visualization_msgs</depend>

<!-- Garden -->
<depend condition="$IGNITION_VERSION == garden">gz-msgs9</depend>
<depend condition="$IGNITION_VERSION == garden">gz-transport12</depend>
<!-- Fortress -->
<depend condition="$IGNITION_VERSION == fortress">ignition-msgs8</depend>
<depend condition="$IGNITION_VERSION == fortress">ignition-transport11</depend>
Expand Down
14 changes: 13 additions & 1 deletion ros_ign_gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,20 @@ find_package(catkin
roscpp
)

# Garden
if ("$ENV{IGNITION_VERSION}" STREQUAL "garden")
find_package(gz-transport12 REQUIRED)
set(IGN_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})

find_package(gz-msgs9 REQUIRED)
set(IGN_MSGS_VER ${gz-msgs9_VERSION_MAJOR})

find_package(gz-sim7 REQUIRED)
set(IGN_GAZEBO_VER ${gz-sim7_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Garden")
# Fortress
if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
elseif ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

Expand Down
2 changes: 2 additions & 0 deletions ros_ign_gazebo/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

<depend>libgflags-dev</depend>

<!-- Garden -->
<depend condition="$IGNITION_VERSION == garden">gz-sim7</depend>
<!-- Fortress -->
<depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</depend>
<!-- Edifice -->
Expand Down
2 changes: 2 additions & 0 deletions ros_ign_gazebo_demos/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<buildtool_depend>catkin</buildtool_depend>

<!-- Garden -->
<exec_depend condition="$IGNITION_VERSION == garden">gz-sim7</exec_depend>
<!-- Fortress -->
<exec_depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</exec_depend>
<!-- Edifice -->
Expand Down
14 changes: 13 additions & 1 deletion ros_ign_image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,20 @@ find_package(catkin REQUIRED COMPONENTS
roscpp
sensor_msgs)

# Garden
if ("$ENV{IGNITION_VERSION}" STREQUAL "garden")
find_package(gz-transport12 REQUIRED)
set(IGN_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})

find_package(gz-msgs9 REQUIRED)
set(IGN_MSGS_VER ${gz-msgs9_VERSION_MAJOR})

find_package(gz-sim7 REQUIRED)
set(IGN_GAZEBO_VER ${gz-sim7_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Garden")
# Fortress
if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
elseif ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

Expand Down
3 changes: 3 additions & 0 deletions ros_ign_image/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

<buildtool_depend>catkin</buildtool_depend>

<!-- Garden -->
<depend condition="$IGNITION_VERSION == garden">gz-msgs9</depend>
<depend condition="$IGNITION_VERSION == garden">gz-transport12</depend>
<!-- Fortress -->
<depend condition="$IGNITION_VERSION == fortress">ignition-msgs8</depend>
<depend condition="$IGNITION_VERSION == fortress">ignition-transport11</depend>
Expand Down
4 changes: 4 additions & 0 deletions ros_ign_point_cloud/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

<buildtool_depend>catkin</buildtool_depend>

<!-- Garden -->
<depend condition="$IGNITION_VERSION == garden">gz-msgs9</depend>
<depend condition="$IGNITION_VERSION == garden">gz-transport12</depend>
<depend condition="$IGNITION_VERSION == garden">ignition-sensors7</depend>
<!-- Fortress -->
<depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</depend>
<depend condition="$IGNITION_VERSION == fortress">ignition-rendering6</depend>
Expand Down
Loading