Commit Graph

113 Commits

Author SHA1 Message Date
Alexander Smorkalov
9314e3266c Debug build for Android added. Stripping of debug build turned off. 2012-08-21 15:33:19 +04:00
Marina Kolpakova
fb3d6ecb98 merged documentation and android service from trunk 2012-07-13 14:27:09 +00:00
Andrey Kamaev
de153f0154 Fixed several opencv version references 2012-07-02 15:40:18 +00:00
Andrey Kamaev
af912f4843 Merged the trunk r8901:8904 2012-07-02 13:46:47 +00:00
Andrey Kamaev
b368f99d03 Merged the trunk r8852:8880 2012-07-02 11:04:43 +00:00
Marina Kolpakova
54ee92e3b0 merged trunk r8815:8827 2012-06-28 17:28:27 +00:00
Marina Kolpakova
b28b2428f6 changing package layout after 'make install' for Android build 2012-06-28 17:23:50 +00:00
Marina Kolpakova
162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811 2012-06-28 17:07:17 +00:00
Marina Kolpakova
01570fa800 merged Android Manager and new java layout 2012-06-28 16:23:19 +00:00
Marina Kolpakova
680a44189c merged the trunk r8704:8716 2012-06-28 16:13:29 +00:00
Marina Kolpakova
2777ebb8a0 merged GPU scan 2012-06-28 16:00:38 +00:00
Marina Kolpakova
6cca6a4548 merged the trunk r8669:8702 2012-06-28 15:41:27 +00:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
052d2dc23a Merged the trunk r8459:8466 (inclusive) 2012-05-30 09:00:32 +00:00
Andrey Kamaev
949c4edf41 Merged the trunk r8408:8457 (inclusive) 2012-05-30 08:47:34 +00:00
Andrey Kamaev
7b5a45eac4 Merged the trunk r8384:8407 (inclusive) 2012-05-30 08:04:37 +00:00
Andrey Kamaev
e1c4fd9e1f Merged the trunk r8345:8376 2012-05-18 13:18:37 +00:00
Andrey Kamaev
70166820ea Merged the trunk r8324:8345 2012-05-18 12:59:40 +00:00
Andrey Kamaev
c3577a288b Merged the trunk r8291:8321 2012-05-18 12:34:01 +00:00
Andrey Kamaev
ba238562c6 Fix for #1902 is merged from trunk 2012-05-07 14:05:06 +00:00
Anatoly Baksheev
10459a886b Added check for CUDA toolkit version ( older can't compile Kepler ) 2012-05-04 10:34:57 +00:00
Anatoly Baksheev
215dd2a41b Merged revision(s) 8304 from trunk/opencv/cmake/OpenCVDetectCUDA.cmake:
Added check for CUDA toolkit version ( older can't compile Kepler )
........
2012-05-04 10:24:23 +00:00
Marina Kolpakova
025f6674db update for kepler arch support 2012-05-04 10:09:17 +00:00
Andrey Kamaev
7bfc50b84d #1854 Fixed Mac OS X build with Clang 2012-04-26 21:40:34 +00:00
Andrey Kamaev
09140c2fc6 Reenabled OpponentSIFT test;
Changed compiler flags for 32-bit MSVC;
Fixed handling of "d" suffix of debug binaries in run.py.
2012-04-26 21:37:27 +00:00
Andrey Kamaev
3d0f4fe167 Fixed compiler flags for debug builds 2012-04-26 11:06:34 +00:00
Andrey Kamaev
8d130ff10c Fixed most of the floating-point accuracy problems for x86 gcc 2012-04-25 11:33:11 +00:00
Andrey Kamaev
019122fba7 Fixed dependencies for cmake status embeeded into opencv core 2012-04-24 07:13:50 +00:00
Andrey Kamaev
2c85aa543c Make ocv_include_directories a function to minimize problems with windows backslashes 2012-04-23 08:54:15 +00:00
Andrey Kamaev
624880fd67 Minor update for new Ninja cmake generator 2012-04-20 13:22:19 +00:00
Andrey Kamaev
247e2d085f Updated for cmake 2.8.8 2012-04-19 22:33:46 +00:00
Andrey Kamaev
44098b2fbb #1813 fixed compiler options with profiling enabled 2012-04-17 11:45:24 +00:00
Andrey Kamaev
ce32b4792f Made OpenCVConfig.cmake friendly to Windows pack 2012-04-16 19:38:19 +00:00
Andrey Kamaev
f9da906144 Fixed Android manifest generation and Android samples install 2012-04-16 09:14:26 +00:00
Andrey Kamaev
00de4b9314 Fixed compiler flags caching in toolchain; fixed zlib search. 2012-04-16 07:24:15 +00:00
Andrey Kamaev
67a336e0be Fixed gcc version parsing. 2012-04-13 19:47:29 +00:00
Andrey Morozov
ee682493fd added support clang compiler 2012-04-13 14:15:17 +00:00
Andrey Kamaev
3b3d1a86ae Fixed ant search on Windows 2012-04-12 15:29:50 +00:00
Andrey Kamaev
7c33d65b59 Fixed broken by r8007 install target 2012-04-12 11:55:33 +00:00
Andrey Kamaev
b3587c9e34 Fixed problem with headers install patch 2012-04-12 11:11:12 +00:00
Andrey Kamaev
47148ce275 Added version detection for OpenNI 2012-04-11 13:20:25 +00:00
Andrey Kamaev
07f8bf9226 Attempt to fix windows build failure 2012-04-11 08:31:43 +00:00
Andrey Kamaev
626afecaf8 Fixed couple of MSVC warnings 2012-04-10 22:21:12 +00:00
Andrey Kamaev
d29a0d4c43 Fixed Ant search (Android build) 2012-04-10 11:59:00 +00:00
Andrey Kamaev
12d42768f8 Slightly improved cmake status report 2012-04-10 08:28:09 +00:00
Alexander Reshetnikov
6f6d12c2b6 Updated cvconfig.h.cmake 2012-04-09 18:51:03 +00:00
Andrey Kamaev
f7853b262b Fixed cmake configuration for Android for case when only one SDK target is available #1781 2012-04-09 14:51:14 +00:00
Andrey Kamaev
c208b58e6b Fixing TBB search and zlib version detection 2012-04-09 13:47:30 +00:00
Andrey Kamaev
aa4a45ff3b Added more version information to cmake status (Qt, CUDA, OpenEXR, gcc) 2012-04-09 13:22:52 +00:00
Andrey Kamaev
d1a8f562b9 Added version detection for zlib, libjpeg, libjasper, libpng, libtiff 2012-04-09 11:32:28 +00:00