Merge pull request opencv#895 from bitwangyaoyao:2.4_perf

zuai · May 20, 2013 · b51a1a7 · b51a1a7
2 parents 389be67 + 04399a2
commit b51a1a7
Show file tree

Hide file tree

Showing 23 changed files with 1,185 additions and 373 deletions.
diff --git a/modules/ocl/CMakeLists.txt b/modules/ocl/CMakeLists.txt
@@ -3,5 +3,5 @@ if(NOT HAVE_OPENCL)
 endif()
 
 set(the_description "OpenCL-accelerated Computer Vision")
-ocv_define_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video)
+ocv_define_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video opencv_calib3d)
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)