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

Jump to bottom

Add support for Dome #103

Merged
merged 2 commits into from
Aug 22, 2020
Merged

Add support for Dome #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d458b7
Add support for Dome
luca-della-vedova Aug 20, 2020
b40e4ff
Find Dome libraries only if Citadel is not found
luca-della-vedova Aug 21, 2020
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
24 changes: 17 additions & 7 deletions ros_ign_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,31 @@ find_package(rosgraph_msgs REQUIRED)
find_package(sensor_msgs REQUIRED)
find_package(std_msgs REQUIRED)

# Citadel
find_package(ignition-transport8 QUIET)
# Citadel
if(ignition-transport8_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})

find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})

find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
find_package(ignition-transport9 QUIET)
# Dome
if(ignition-transport9_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})

find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
endif()
endif()

include_directories(include)
Expand Down
22 changes: 16 additions & 6 deletions ros_ign_gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,31 @@ find_package(ament_cmake REQUIRED)
find_package(ignition-math6 REQUIRED)
find_package(rclcpp REQUIRED)

# Citadel
find_package(ignition-transport8 QUIET)
# Citadel
if(ignition-transport8_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})

find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})
find_package(ignition-transport9 QUIET)
# Dome
if(ignition-transport9_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})

find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
endif()
endif()

ign_find_package(gflags
Expand Down
24 changes: 17 additions & 7 deletions ros_ign_image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,31 @@ find_package(ros_ign_bridge REQUIRED)
find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED)

# Citadel
find_package(ignition-transport8 QUIET)
# Citadel
if(ignition-transport8_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})

find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})

find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
find_package(ignition-transport9 QUIET)
# Dome
if(ignition-transport9_FOUND)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

# Blueprint
else()
find_package(ignition-transport7 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport7_VERSION_MAJOR})

find_package(ignition-msgs4 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs4_VERSION_MAJOR})
endif()
endif()

include_directories(include)
Expand Down