Andrey Kamaev
e161f428a0
Fixed PvAPI search on Windows #1927
2012-05-24 20:10:13 +00:00
Vadim Pisarevsky
fd68cc768a
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876 )
2012-05-21 14:56:07 +00:00
Andrey Kamaev
ac8f61ee91
Fixed Linux build
2012-05-21 08:53:38 +00:00
Andrey Kamaev
decd6c0fab
Restored QuartzCore framework for OS X
2012-05-20 19:05:36 +00:00
Andrey Kamaev
0716ebb7a6
Refactored highgui libraries search (tested on Windows only)
2012-05-20 18:49:57 +00:00
Andrey Kamaev
8d135e8ea1
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
2012-05-13 09:34:33 +00:00
Vadim Pisarevsky
6dde56faf4
fixed building opencv_world with VS2010
2012-05-12 16:27:40 +00:00
Vadim Pisarevsky
9bbcebd6b0
added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.
2012-05-12 13:54:26 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
3228599a35
fixed some more GCC warnings
2012-03-19 11:21:01 +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
Andrey Kamaev
8141a5026c
Refactored cmake for 3rdparty libs
2012-02-24 13:53:22 +00:00
Andrey Kamaev
a8f0c93379
Modified zlib search. Use system zlib on Android by default
2012-02-24 12:23:34 +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
Alexander Reshetnikov
edc9d4f951
fixed compiling error under Windows; updated test_video_io.cpp
2012-02-13 12:41:27 +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
Andrey Kamaev
aa9735f9b5
Fixed mingw build
2012-02-06 13:29:48 +00:00
Andrey Kamaev
eac055a27e
Fixed ticket #1580
2012-02-04 18:57:41 +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
Ethan Rublee
b254358d35
highgui headers were not being installed...
2012-01-30 19:07:14 +00:00
Andrey Kamaev
82ae0b2c0c
Attempt to fix build on Mac OS X
2012-01-25 10:58:55 +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
5cce038958
Performance testing branch is merged back into trunk
2011-09-06 15:30:28 +00:00
Artem Myagkov
3a3bc18381
modified capturing building ligic for iOS
2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a
modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial
2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
d1588c0439
added support for Ximea cameras (missing parts in the prev. commit)
2011-08-11 18:06:09 +00:00
Andrey Kamaev
3aea74d408
Fixed precompiled headers support (fixed formatting, fixed dependencies generation)
2011-07-24 19:22:58 +00:00
Vadim Pisarevsky
b33224f0b6
merged the latest fixes in 2.3 to trunk
2011-07-04 16:18:12 +00:00
Andrey Kamaev
730622178b
Turned off android camera and java wrappers for low Android API levels (android-8 is required for these components)
2011-07-04 11:41:39 +00:00
Andrey Kamaev
68f5a5a904
Reverted change from r5802 (it breaks install target for Android platform)
2011-07-01 06:58:53 +00:00
Ethan Rublee
08d3dcc709
minor edits to cmake.
2011-07-01 00:57:00 +00:00
Ethan Rublee
6259c9ac6a
First pass at name mangling based on version number, to support
...
side by side installs of OpenCV2.3.0 OpenCV2.3.1 OpenCV2.4.x, etc...
2011-06-28 16:02:09 +00:00
Andrey Kamaev
c1940b4ec7
Modified install layout for Android
2011-06-24 15:40:27 +00:00
Vadim Pisarevsky
49467947ac
propagated some fixes from 2.3 to trunk
2011-06-23 12:00:09 +00:00
Ilya Lysenkov
77be493e45
Qt: fixed keyPressEvent (ticket #803 )
2011-06-17 09:26:53 +00:00
Andrey Kamaev
206aa50f86
Added Android native camera module
2011-06-16 18:00:41 +00:00
Anatoly Baksheev
8f4c7db3f6
~40 warnings under VS2008
...
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
2011-06-11 17:24:09 +00:00
Andrey Kamaev
c7bdf83de5
Fixed Android build
2011-06-03 12:01:55 +00:00
Alexander Shishkov
c8f0147a8b
fixed problem with static compilation of highgui_tests on Windows
2011-06-02 10:02:08 +00:00
Ethan Rublee
6c437cce36
Placed the if in the wrong place.
2011-06-01 18:54:34 +00:00
Ethan Rublee
7e2221f38f
Fix misspelling of a logical block endif.
2011-06-01 18:28:20 +00:00
Ethan Rublee
14f65f79f0
Wrapping the tests in an if guard. Fails to build if the BUILD_TESTS flag is
...
not enabled.
2011-06-01 18:04:46 +00:00
Andrey Morozov
abfc5d3405
fixed bugs for windows. added 2 tests for ffmpeg
2011-06-01 16:14:17 +00:00
Vadim Pisarevsky
bf05872929
added opencv_test_highgui
2011-06-01 14:23:55 +00:00
Alexander Shishkov
6aabf72bc5
removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS
2011-05-31 13:17:59 +00:00
Ethan Rublee
76538fbe6b
Making the install and lib, bin directories consistent.
2011-05-30 22:13:32 +00:00
