opencv/modules/superres/CMakeLists.txt

if(ANDROID OR IOS)
  ocv_module_disable(superres)
endif()

set(the_description "Super Resolution")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
ocv_define_module(superres opencv_imgproc opencv_video
                  OPTIONAL opencv_highgui opencv_ocl
                  opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_gpucodec)
Super Resolution module 2013-02-25 18:33:00 +08:00			`if(ANDROID OR IOS)`
			`ocv_module_disable(superres)`
			`endif()`

			`set(the_description "Super Resolution")`
moved device layer to core module 2013-03-31 18:54:23 +08:00			`ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)`
Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-04 17:32:35 +08:00			`ocv_define_module(superres opencv_imgproc opencv_video`
Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts: modules/core/include/opencv2/core/version.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/initialization.cpp modules/ocl/test/main.cpp modules/superres/CMakeLists.txt modules/superres/src/input_array_utility.cpp modules/superres/src/input_array_utility.hpp modules/superres/src/optical_flow.cpp 2013-07-15 22:40:54 +08:00			`OPTIONAL opencv_highgui opencv_ocl`
Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-04 17:32:35 +08:00			`opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_gpucodec)`