Skip to content

Commit adb38a2

Browse files
committed
HISTCMP_CORREL only available since OpenCV 3.0 (opencv/opencv#785)
1 parent 44d3994 commit adb38a2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,10 @@ opencv_apps_add_nodelet(discrete_fourier_transform src/nodelet/discrete_fourier_
170170
# ./tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp
171171
# ./tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp
172172
# ./tutorial_code/Histograms_Matching/calcHist_Demo.cpp
173+
if(OpenCV_VERSION GREATER_LESS "3.0")
173174
opencv_apps_add_nodelet(compare_histogram src/nodelet/compare_histogram_nodelet.cpp) # ./tutorial_code/Histograms_Matching/compareHist_Demo.cpp
174-
opencv_apps_add_nodelet(equalize_histogram src/nodelet/equalize_histogram_nodelet.cpp) # ./tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp
175+
endif()
176+
opencv_apps_add_nodelet(equalize_histogram src/nodelet/equalize_histogram_nodelet.cpp) # ./tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp
175177
# ./tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp
176178

177179
# imagecodecs

test/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ add_rostest(test-hls_color_filter.test ARGS gui:=false)
5656
add_rostest(test-hsv_color_filter.test ARGS gui:=false)
5757
add_rostest(test-lab_color_filter.test ARGS gui:=false)
5858
add_rostest(test-edge_detection.test ARGS gui:=false)
59-
add_rostest(test-compare_histogram.test ARGS gui:=false)
59+
if(OpenCV_VERSION GREATER_LESS "3.0")
60+
add_rostest(test-compare_histogram.test ARGS gui:=false)
61+
endif()
6062
add_rostest(test-equalize_histogram.test ARGS gui:=false)
6163

6264
add_rostest(test-hough_lines.test ARGS gui:=false)

0 commit comments

Comments
 (0)