opencv/modules/nonfree/CMakeLists.txt

if(BUILD_ANDROID_PACKAGE)
  ocv_module_disable(nonfree)
endif()

set(the_description "Functionality with possible limitations on the use")
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpuarithm opencv_ocl)
merged trunk r8815:8827 2012-06-29 01:28:27 +08:00			`if(BUILD_ANDROID_PACKAGE)`
			`ocv_module_disable(nonfree)`
			`endif()`

lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 22:36:01 +08:00			`set(the_description "Functionality with possible limitations on the use")`
Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-04 17:32:35 +08:00			`ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)`
			`ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpuarithm opencv_ocl)`