Skip to content

Commit 5f9777b

Browse files
committed
OpenCV < 3 : remove compare_histogram from roslaunch_add_file_check
1 parent 49e4e72 commit 5f9777b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ if(CATKIN_ENABLE_TESTING)
390390
message(WARNING "roslaunch_add_file check fails with unsupported doc attributes ${roslaunch_VERSION}")
391391
else()
392392
file(GLOB LAUNCH_FILES launch/*.launch)
393+
if(NOT OpenCV_VERSION VERSION_GREATER "3.0")
394+
list(REMOVE_ITEM LAUNCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/launch/compare_histogram.launch)
395+
endif()
393396
foreach(LAUNCH_FILE ${LAUNCH_FILES})
394397
roslaunch_add_file_check(${LAUNCH_FILE})
395398
endforeach()

test/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ if(roslaunch_VERSION VERSION_LESS "1.11.1")
108108
message(WARNING "roslaunch_add_file check fails with unsupported doc attributes ${roslaunch_VERSION}")
109109
else()
110110
file(GLOB LAUNCH_FILES *.test)
111+
if(NOT OpenCV_VERSION VERSION_GREATER "3.0")
112+
list(REMOVE_ITEM LAUNCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/test-compare_histogram.test)
113+
endif()
111114
foreach(LAUNCH_FILE ${LAUNCH_FILES})
112115
roslaunch_add_file_check(${LAUNCH_FILE})
113116
endforeach()

0 commit comments

Comments
 (0)