Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c4af85043a
					 | 
					
						
						
							
							merged few missed changes from 2.4 to trunk
						
						
						
						
						
						
					 | 
					
						2012-04-15 23:19:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						2fd1e2ea57
					 | 
					
						
						
							
							merged all the latest changes from 2.4 to trunk
						
						
						
						
						
						
					 | 
					
						2012-04-13 21:50:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexey Spizhevoy
							
						 
					 | 
					
						
						
							
						
						ae839df55d
					 | 
					
						
						
							
							Added WITH_CLP flag support into cmake scripts.
						
						
						
						
						
						
					 | 
					
						2012-04-11 12:34:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c648de0e08
					 | 
					
						
						
							
							Fixed build error in Android examples when java bindings are excluded from build.
						
						
						
						
						
						
					 | 
					
						2012-03-31 12:26:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						2c2616d46f
					 | 
					
						
						
							
							#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used
						
						
						
						
						
						
					 | 
					
						2012-03-28 13:37:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						7d51a4ab78
					 | 
					
						
						
							
							#1416 added option to install OpenCVConfig.cmake i arch-dependent lo
						
						
						
						
						
						
					 | 
					
						2012-03-28 10:38:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						e72a23243b
					 | 
					
						
						
							
							Reworked build scripts for Android Java API, tests and examples
						
						
						
						
						
						
					 | 
					
						2012-03-27 16:05:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Shishkov
							
						 
					 | 
					
						
						
							
						
						216ef24b92
					 | 
					
						
						
							
							fixed Debug compilation on Windows (it works for VS versions > 2005)
						
						
						
						
						
						
					 | 
					
						2012-03-26 07:33:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						8991d323ea
					 | 
					
						
						
							
							Refactored Java wrapper build scripts.
						
						
						
						
						
						
						
						Improved Android SDK search, fixed some bugs. 
						
						
					 | 
					
						2012-03-25 19:57:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						9b2d7e19db
					 | 
					
						
						
							
							Added "fat" mode for Java wrapper
						
						
						
						
						
						
					 | 
					
						2012-03-23 17:03:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						305d024137
					 | 
					
						
						
							
							CMake status report: list unsatisfied dependencies for automatically disabled modules; fixed few problems with Windows-style paths
						
						
						
						
						
						
					 | 
					
						2012-03-16 09:16:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						ddc4ed4741
					 | 
					
						
						
							
							Added protection from modules redefinition and globbing recursion
						
						
						
						
						
						
					 | 
					
						2012-03-15 09:20:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						e4307d05f3
					 | 
					
						
						
							
							Made dependency of features2d and calib3d from highgui optional
						
						
						
						
						
						
					 | 
					
						2012-03-13 12:33:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						628076b7da
					 | 
					
						
						
							
							Fixed broken headers install layout
						
						
						
						
						
						
					 | 
					
						2012-03-11 15:22:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Morozov
							
						 
					 | 
					
						
						
							
						
						52b4536d39
					 | 
					
						
						
							
							fixed module name for mingw compiler under Windows
						
						
						
						
						
						
					 | 
					
						2012-03-11 07:00:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						18dbe6b3e5
					 | 
					
						
						
							
							cmake scripts are updated to prefer includes from the OpenCV source tree
						
						
						
						
						
						
					 | 
					
						2012-03-03 15:49:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						18933c12f7
					 | 
					
						
						
							
							Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration
						
						
						
						
						
						
					 | 
					
						2012-03-02 14:48:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						ab221fb3d6
					 | 
					
						
						
							
							More accurate cmake flags sets/unsets for 3rdparty libs
						
						
						
						
						
						
					 | 
					
						2012-03-02 11:36:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Shishkov
							
						 
					 | 
					
						
						
							
						
						06a6c5851c
					 | 
					
						
						
							
							updated libpng: from 1.4.3 to 1.5.9 #1609
						
						
						
						
						
						
					 | 
					
						2012-03-02 11:01:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						aa6c677bd8
					 | 
					
						
						
							
							Added opencv_tests and opencv_perf_tests targets to simplify building tests only
						
						
						
						
						
						
					 | 
					
						2012-03-02 08:48:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						2f4bb580fc
					 | 
					
						
						
							
							Fixed some build warnings; slightly improved python search
						
						
						
						
						
						
					 | 
					
						2012-03-02 08:34:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						0db570b1ca
					 | 
					
						
						
							
							minor cmake update
						
						
						
						
						
						
					 | 
					
						2012-03-01 10:44:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						e8afcdba0a
					 | 
					
						
						
							
							More flexible tiff library configuration
						
						
						
						
						
						
					 | 
					
						2012-03-01 09:01:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						2d81ecce23
					 | 
					
						
						
							
							fixed required CUDA version in OpenCVDetectCUDA.cmake
						
						
						
						
						
						
					 | 
					
						2012-02-29 20:24:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						4b5d04f475
					 | 
					
						
						
							
							Fixed tbb hang in Android apps
						
						
						
						
						
						
					 | 
					
						2012-02-29 08:11:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						212ceb3e24
					 | 
					
						
						
							
							Minor improvement for Android TBB
						
						
						
						
						
						
					 | 
					
						2012-02-27 12:49:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						cb9823704c
					 | 
					
						
						
							
							#1568 support of building with OpenEXR on Windows
						
						
						
						
						
						
					 | 
					
						2012-02-27 06:23:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c6445e2de1
					 | 
					
						
						
							
							Slightly improved build of TBB for Android
						
						
						
						
						
						
					 | 
					
						2012-02-27 06:19:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						22d7e6b741
					 | 
					
						
						
							
							Scripts for building TBB for Android
						
						
						
						
						
						
					 | 
					
						2012-02-24 18:16:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						8141a5026c
					 | 
					
						
						
							
							Refactored cmake for 3rdparty libs
						
						
						
						
						
						
					 | 
					
						2012-02-24 13:53:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						01b986ef32
					 | 
					
						
						
							
							Fixed try_compile for Android; Fixed samples build
						
						
						
						
						
						
					 | 
					
						2012-02-24 09:35:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						aa9eeddd86
					 | 
					
						
						
							
							Fixed problem with backslashes in cmake status report
						
						
						
						
						
						
					 | 
					
						2012-02-23 20:05:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						4ac407e76a
					 | 
					
						
						
							
							Small refactoring of OpenCV cmake options
						
						
						
						
						
						
					 | 
					
						2012-02-22 14:04:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						b294383199
					 | 
					
						
						
							
							Added more default search locations for Android NDK and SDK
						
						
						
						
						
						
					 | 
					
						2012-02-20 14:50:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						16fb7d231e
					 | 
					
						
						
							
							Fixed problem with Android native camera helper libraries
						
						
						
						
						
						
					 | 
					
						2012-02-20 12:51:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						00db5a69a2
					 | 
					
						
						
							
							More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
						
						
						
						
						
						
					 | 
					
						2012-02-20 11:50:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Shishkov
							
						 
					 | 
					
						
						
							
						
						8dc28473c7
					 | 
					
						
						
							
							fixed #1339
						
						
						
						
						
						
					 | 
					
						2012-02-20 09:16:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						504262d3d8
					 | 
					
						
						
							
							Fixed #1608
						
						
						
						
						
						
					 | 
					
						2012-02-19 21:56:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						4f97b20ff6
					 | 
					
						
						
							
							Refactored OpenCVConfig.cmake generation code.
						
						
						
						
						
						
					 | 
					
						2012-02-19 21:30:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						691d392312
					 | 
					
						
						
							
							Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
						
						
						
						
						
						
					 | 
					
						2012-02-16 20:29:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						6f7e3434ca
					 | 
					
						
						
							
							moved finding CUDA_npp_LIBRARY to OpenCVDetectCUDA.cmake
						
						
						
						
						
						
					 | 
					
						2012-02-15 06:44:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatoly Baksheev
							
						 
					 | 
					
						
						
							
						
						84db4eb6fa
					 | 
					
						
						
							
							fixed ~200 warnings for windows
						
						
						
						
						
						
						
						minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables) 
						
						
					 | 
					
						2012-02-14 10:22:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						68a54e7f3c
					 | 
					
						
						
							
							Fixed incorrectly merged patch.
						
						
						
						
						
						
					 | 
					
						2012-02-09 20:22:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leonid Beynenson
							
						 
					 | 
					
						
						
							
						
						3ef5bfa185
					 | 
					
						
						
							
							Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue.
						
						
						
						
						
						
					 | 
					
						2012-02-09 15:02:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						a618b774f2
					 | 
					
						
						
							
							fixed OpenCVConfig.cmake for creating Xcode projects
						
						
						
						
						
						
					 | 
					
						2012-02-08 05:45:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						23af203e00
					 | 
					
						
						
							
							Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
						
						
						
						
						
						
					 | 
					
						2012-02-06 11:30:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						014577b433
					 | 
					
						
						
							
							fixed OpenCVDetectTBB.cmake (WIN32 x86 VS library path)
						
						
						
						
						
						
					 | 
					
						2012-02-06 06:11:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						eac055a27e
					 | 
					
						
						
							
							Fixed ticket #1580
						
						
						
						
						
						
					 | 
					
						2012-02-04 18:57:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						dfb161e9c9
					 | 
					
						
						
							
							Fixing #1580
						
						
						
						
						
						
					 | 
					
						2012-02-03 19:18:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						fdc1e87ddf
					 | 
					
						
						
							
							Attempt to fix #1580 - building OpenCV with ffmpeg not in LD_LIBRARY_PATH
						
						
						
						
						
						
					 | 
					
						2012-02-03 18:52:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |