Commit Graph

260 Commits

Author SHA1 Message Date
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
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
ab20da0f53 Merged the trunk r8547:8574, r8587 2012-06-15 08:36:35 +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
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
Vadim Pisarevsky
4a34487a03 get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg 2012-04-30 12:39:49 +00:00
Vadim Pisarevsky
083cbe999b force BUILD_PNG/JPEG/TIFF/ZLIB on MacOSX, because sometimes the found lib<...> is different from the one used in build. 2012-04-28 22:54:14 +00:00
Andrey Kamaev
b1bf062671 Configuration name is added to the CMake status report 2012-04-24 07:30:38 +00:00
Andrey Kamaev
019122fba7 Fixed dependencies for cmake status embeeded into opencv core 2012-04-24 07:13:50 +00:00
Andrey Kamaev
7c025dfc60 Added CUDA version to CMake status 2012-04-24 06:05:57 +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
47148ce275 Added version detection for OpenNI 2012-04-11 13:20:25 +00:00
Andrey Kamaev
570ec2f166 Improved status report for Eigen and Ximea, improved search of PvApi headers/libs 2012-04-11 12:05:53 +00:00
Andrey Kamaev
626afecaf8 Fixed couple of MSVC warnings 2012-04-10 22:21:12 +00:00
Andrey Kamaev
12d42768f8 Slightly improved cmake status report 2012-04-10 08:28:09 +00:00
Andrey Kamaev
935222c58f ffmpeg version info for Windows 2012-04-09 18:31:52 +00:00
Andrey Kamaev
6fa2f3b74d Minor formatting fix in status report 2012-04-09 14:56:11 +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
97427aa614 Added more version information to cmake status (FFMPEG, GStreamer, Unicap, Xine, V4L, DC1394) 2012-04-09 14:41:18 +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
Andrey Kamaev
7ed80d54d7 Added TBB version detection to CMake 2012-04-09 07:53:04 +00:00
Andrey Kamaev
7cc7a3f37d Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings. 2012-04-08 21:49:19 +00:00
Andrey Kamaev
c16a1d86cc Fixed python detection on Windows with both 32bit and 64bit pythons installed. 2012-04-08 17:36:41 +00:00
Andrey Kamaev
1c1c6b98f6 #645 Added cv::getBuildInformation function (with sample) to get OpenCV build configuration 2012-04-06 15:43:20 +00:00
Vadim Pisarevsky
32d72047d5 reduced the video size in video writer tests; retained only most popular codecs. added ffmpeg support on MacOSX. 2012-04-05 18:26:49 +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
63c6e9d6d2 #1537 removed suspicious lines clearing optimization flags 2012-03-28 13:59:48 +00:00
Andrey Kamaev
3ac1f31126 Fixed Android tests and samples status in cmake report; restored java tests "coverage calculation". 2012-03-27 21:27:27 +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
6412e17df6 fixed #1502 2012-03-26 18:58: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
Alexander Reshetnikov
0dd4386d77 Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file 2012-03-21 18:07:34 +00:00
Andrey Kamaev
2e03e6c06c Solution folders are turned on by default for MS Visual Studio IDE. 2012-03-19 18:47:27 +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
Vadim Pisarevsky
b5a9c9ac77 temporarily turned off the new wrapper. 2012-03-15 19:58:35 +00:00
Alexander Reshetnikov
36b2ff3cf3 Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows 2012-03-15 09:24:03 +00:00
Alexander Reshetnikov
e0b772a392 Added a first version of new ffmpeg wrapper 2012-03-12 17:07:54 +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
2f4bb580fc Fixed some build warnings; slightly improved python search 2012-03-02 08:34:54 +00:00
Andrey Kamaev
8df208cf56 Fixed compiler flags for 3rdparty libs. 2012-02-24 21:54:29 +00:00