Skip to content

Commit b2d028c

Browse files
committed
use correct img transp version 5.0.0
1 parent 87df70f commit b2d028c

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

CMakeLists.txt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1111
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
1212
endif()
1313

14-
# the image transport api changed between distros
15-
if(DEFINED ENV{ROS_DISTRO})
16-
if($ENV{ROS_DISTRO} STREQUAL "foxy" OR
17-
$ENV{ROS_DISTRO} STREQUAL "galactic")
18-
add_definitions(-DIMAGE_TRANSPORT_API_V1)
19-
elseif($ENV{ROS_DISTRO} STREQUAL "humble")
20-
add_definitions(-DIMAGE_TRANSPORT_API_V2)
21-
else()
22-
add_definitions(-DIMAGE_TRANSPORT_API_V3)
23-
endif()
24-
else()
25-
message(ERROR "ROS_DISTRO environment variable is not set!")
26-
endif()
27-
2814
find_package(ament_cmake REQUIRED)
2915
find_package(ament_cmake_ros REQUIRED)
3016
find_package(ffmpeg_image_transport_msgs REQUIRED)
@@ -37,16 +23,9 @@ find_package(sensor_msgs REQUIRED)
3723
find_package(std_msgs REQUIRED)
3824

3925

40-
if(${image_transport_VERSION} VERSION_GREATER_EQUAL "3.1.0")
41-
# Humble and later (formerly API_V2)
42-
# add_definitions(-DIMAGE_TRANSPORT_API_V2)
43-
endif()
44-
45-
if(${image_transport_VERSION} VERSION_GREATER_EQUAL "5.1.7")
46-
# Jazzy and later (formerly API_V3)
26+
if(${image_transport_VERSION} VERSION_GREATER_EQUAL "5.0.0")
4727
add_definitions(-DIMAGE_TRANSPORT_USE_PUBLISHER_T)
4828
add_definitions(-DIMAGE_TRANSPORT_NEEDS_PUBLISHEROPTIONS)
49-
# add_definitions(-DIMAGE_TRANSPORT_API_V3)
5029
endif()
5130

5231
if(${image_transport_VERSION} VERSION_GREATER_EQUAL "6.0.0")

0 commit comments

Comments
 (0)