opencv/cmake at b5c013682b82a70c74dbaa33912f1f9aa771fd1f - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 029fce10c9 Merge remote-tracking branch 'origin/2.4'

Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp

2013-05-21 17:19:23 +04:00

..

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

cl2cpp.cmake

discard comments in kernels.cpp

2013-03-26 12:01:01 +08:00

CMakeParseArguments.cmake

minor fix in FindTBB

2012-08-23 13:37:27 +04:00

OpenCVCompilerOptions.cmake

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

OpenCVConfig.cmake

Advance version number to 2.4.3-rc

2012-10-23 17:59:59 +04:00

OpenCVCRTLinkage.cmake

Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration

2012-03-02 14:48:35 +00:00

OpenCVDetectAndroidSDK.cmake

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

OpenCVDetectApacheAnt.cmake

Fix ant/Java detection in cmake scripts

2013-03-29 18:29:40 +04:00

OpenCVDetectCStripes.cmake

fixed C= detection script

2012-10-10 16:15:27 +04:00

OpenCVDetectCUDA.cmake

Revert "Merge pull request #836 from jet47:gpu-modules"

2013-04-18 15:03:50 +04:00

OpenCVDetectCXXCompiler.cmake

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

OpenCVDetectOpenCL.cmake

fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)

2013-04-29 23:10:03 +04:00

OpenCVDetectPython.cmake

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

2013-02-06 14:43:57 +04:00

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

2013-03-25 21:57:53 +04:00

OpenCVFindIPP.cmake

fixed detection of IPP 7.1 (patch #2413 : thanks to Gino van den Bergen!)

2012-10-08 22:00:25 +04:00

OpenCVFindLATEX.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindLibsGrfmt.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsGUI.cmake

Update CMake scripts to recognize Qt 5.0

2013-05-13 17:10:32 +04:00

OpenCVFindLibsPerf.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsVideo.cmake

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

OpenCVFindOpenEXR.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindOpenNI.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindPkgConfig.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindWebP.cmake

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

OpenCVFindXimea.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVGenAndroidMK.cmake

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

2013-02-22 11:57:42 +04:00

OpenCVGenConfig.cmake

Fix OpenCVConfig.cmake generated for Android platform (issue #2496 )

2013-02-27 15:04:29 +04:00

OpenCVGenHeaders.cmake

Fixed linux and android install

2012-06-27 13:52:29 +00:00

OpenCVGenPkgconfig.cmake

Fixed linux and android install

2012-06-27 13:52:29 +00:00

OpenCVLegacyOptions.cmake

Code review notes fixed.

2013-04-03 04:14:40 -07:00

OpenCVModule.cmake

Automatically add CUDA support to a module if it has CUDA sources.

2013-04-10 12:20:54 +04:00

OpenCVPCHSupport.cmake

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

OpenCVUtils.cmake

Detect version of clang compiler

2013-02-13 14:11:56 +04:00

OpenCVVersion.cmake

Consistently use 4-digit library version

2013-01-18 14:57:55 +04:00