File tree Expand file tree Collapse file tree 2 files changed +6
-0
lines changed
Expand file tree Collapse file tree 2 files changed +6
-0
lines changed Original file line number Diff line number Diff 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 ()
Original file line number Diff line number Diff 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} " )
109109else ()
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 ()
You can’t perform that action at this time.
0 commit comments