OpenCV < 3 : remove compare_histogram from roslaunch_add_file_check

ros-perception · Feb 18, 2022 · 5f9777b · 5f9777b
1 parent 49e4e72
commit 5f9777b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -390,6 +390,9 @@ if(CATKIN_ENABLE_TESTING)
     message(WARNING "roslaunch_add_file check fails with unsupported doc attributes ${roslaunch_VERSION}")
   else()
     file(GLOB LAUNCH_FILES launch/*.launch)
+    if(NOT OpenCV_VERSION VERSION_GREATER "3.0")
+      list(REMOVE_ITEM LAUNCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/launch/compare_histogram.launch)
+    endif()
     foreach(LAUNCH_FILE ${LAUNCH_FILES})
       roslaunch_add_file_check(${LAUNCH_FILE})
     endforeach()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -108,6 +108,9 @@ if(roslaunch_VERSION VERSION_LESS "1.11.1")
   message(WARNING "roslaunch_add_file check fails with unsupported doc attributes ${roslaunch_VERSION}")
 else()
   file(GLOB LAUNCH_FILES *.test)
+  if(NOT OpenCV_VERSION VERSION_GREATER "3.0")
+    list(REMOVE_ITEM LAUNCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/test-compare_histogram.test)
+  endif()
   foreach(LAUNCH_FILE ${LAUNCH_FILES})
     roslaunch_add_file_check(${LAUNCH_FILE})
   endforeach()