Skip to content
Merged
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
23 changes: 1 addition & 22 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
endif()

# the image transport api changed between distros
if(DEFINED ENV{ROS_DISTRO})
if($ENV{ROS_DISTRO} STREQUAL "foxy" OR
$ENV{ROS_DISTRO} STREQUAL "galactic")
add_definitions(-DIMAGE_TRANSPORT_API_V1)
elseif($ENV{ROS_DISTRO} STREQUAL "humble")
add_definitions(-DIMAGE_TRANSPORT_API_V2)
else()
add_definitions(-DIMAGE_TRANSPORT_API_V3)
endif()
else()
message(ERROR "ROS_DISTRO environment variable is not set!")
endif()

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_ros REQUIRED)
find_package(ffmpeg_image_transport_msgs REQUIRED)
Expand All @@ -37,16 +23,9 @@ find_package(sensor_msgs REQUIRED)
find_package(std_msgs REQUIRED)


if(${image_transport_VERSION} VERSION_GREATER_EQUAL "3.1.0")
# Humble and later (formerly API_V2)
# add_definitions(-DIMAGE_TRANSPORT_API_V2)
endif()

if(${image_transport_VERSION} VERSION_GREATER_EQUAL "5.1.7")
# Jazzy and later (formerly API_V3)
if(${image_transport_VERSION} VERSION_GREATER_EQUAL "5.0.0")
add_definitions(-DIMAGE_TRANSPORT_USE_PUBLISHER_T)
add_definitions(-DIMAGE_TRANSPORT_NEEDS_PUBLISHEROPTIONS)
# add_definitions(-DIMAGE_TRANSPORT_API_V3)
endif()

if(${image_transport_VERSION} VERSION_GREATER_EQUAL "6.0.0")
Expand Down