From 5f9777b77e2c267192fe3c77b4d7e2cb0cd5bebe Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 18 Feb 2022 14:25:55 +0900 Subject: [PATCH] OpenCV < 3 : remove compare_histogram from roslaunch_add_file_check --- CMakeLists.txt | 3 +++ test/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c41f2dd..af543659 100644 --- 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 index da616de7..3cd329b9 100644 --- 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()