Andrey Kamaev 7f542e391a Merge branch 2.4 ...

Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4

2012-11-20 19:12:00 +04:00

..

templates

Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.

2012-11-19 12:58:17 +04:00

CMakeParseArguments.cmake

minor fix in FindTBB

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

OpenCVCompilerOptions.cmake

Merge branch '2.4'

2012-10-23 20:32:19 +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

Normalize line endings and whitespace

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

OpenCVDetectApacheAnt.cmake

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

OpenCVDetectCStripes.cmake

fixed C= detection script

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

OpenCVDetectCUDA.cmake

Normalize line endings and whitespace

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

OpenCVDetectCXXCompiler.cmake

Fix Android build with clang compiler

2012-11-20 15:20:04 +04:00

OpenCVDetectOpenCL.cmake

remove redundant OPENCL_DIR flag

2012-10-22 15:14:22 +08:00

OpenCVDetectPython.cmake

Normalize line endings and whitespace

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

OpenCVDetectTBB.cmake

minor

2012-10-12 23:03:31 +04:00

OpenCVExtraTargets.cmake

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +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

Added OpenEXR library v1.7.1

2012-09-02 20:44:04 +04:00

OpenCVFindLibsGUI.cmake

Moved 3rd-party libraries detection to separate cmake files

2012-05-25 13:12:02 +00:00

OpenCVFindLibsPerf.cmake

Added default Eigen search path to support Eigen that comes with PCL

2012-10-23 15:12:39 +04:00

OpenCVFindLibsVideo.cmake

#2192 patch apply

2012-10-12 13:03:43 +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

OpenCVFindXimea.cmake

Normalize line endings and whitespace

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

OpenCVGenAndroidMK.cmake

Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.

2012-11-19 12:58:17 +04:00

OpenCVGenConfig.cmake

fix hardcoded paths for static build OpenCV with CUDA

2012-10-08 10:52:58 +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

Refactored cmake for 3rdparty libs

2012-02-24 13:53:22 +00:00

OpenCVModule.cmake

Add sanity checks support for vertor<KeyPoint>

2012-10-09 18:41:26 +04:00

OpenCVPCHSupport.cmake

Fix OS X build warnings

2012-10-22 20:33:14 +04:00

OpenCVUtils.cmake

minor fix in FindTBB

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

OpenCVVersion.cmake

Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.

2012-02-16 20:29:35 +00:00