48432502b6
Conflicts: cmake/OpenCVDetectCUDA.cmake doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst modules/core/CMakeLists.txt modules/features2d/perf/opencl/perf_brute_force_matcher.cpp modules/highgui/src/grfmt_tiff.cpp modules/imgproc/src/clahe.cpp modules/imgproc/src/moments.cpp modules/nonfree/CMakeLists.txt modules/ocl/perf/perf_ml.cpp modules/superres/CMakeLists.txt
8 lines
296 B
CMake
8 lines
296 B
CMake
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 -Wshadow)
|
|
ocv_define_module(nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_cudaarithm)
|