Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2fd1e2ea57 
					 
					
						
						
							
							merged all the latest changes from 2.4 to trunk  
						
						
						
						
					 
					
						2012-04-13 21:50:59 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e72a23243b 
					 
					
						
						
							
							Reworked build scripts for Android Java API, tests and examples  
						
						
						
						
					 
					
						2012-03-27 16:05:52 +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 
							
						 
					 
					
						
						
							
						
						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 Kamaev 
							
						 
					 
					
						
						
							
						
						18dbe6b3e5 
					 
					
						
						
							
							cmake scripts are updated to prefer includes from the OpenCV source tree  
						
						
						
						
					 
					
						2012-03-03 15:49:23 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						691d392312 
					 
					
						
						
							
							Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.  
						
						
						
						
					 
					
						2012-02-16 20:29:35 +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 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						984eb99428 
					 
					
						
						
							
							Global CMake reorganization:  
						
						... 
						
						
						
						[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules 
						
						
					 
					
						2012-02-03 11:26:49 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						ada9158521 
					 
					
						
						
							
							Fixed the building process for (ubuntu 64bit debug cuda4.1) configuration  
						
						
						
						
					 
					
						2012-02-02 14:06:13 +00:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						3c645ae20c 
					 
					
						
						
							
							fixed CUDA compilation  
						
						
						
						
					 
					
						2012-01-25 15:27:37 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						c86c6a028c 
					 
					
						
						
							
							Updating opencv module definition in cmake (continued)  
						
						
						
						
					 
					
						2012-01-25 13:12:11 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						9d5c24cdc8 
					 
					
						
						
							
							Updating opencv module definition in cmake (continued)  
						
						
						
						
					 
					
						2012-01-25 09:04:49 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						13f4e70e95 
					 
					
						
						
							
							Updating opencv module definition in cmake  
						
						
						
						
					 
					
						2012-01-24 16:55:47 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8cab65c173 
					 
					
						
						
							
							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