Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Anatoly Baksheev
1d68850cb2
Added CUDA fast math flag
2012-10-10 22:16:51 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Andrey Pavlenko
3c4917555d
fixing git commit getting for Android build
2012-09-17 17:08:48 +04:00
Andrey Kamaev
f32eb05ea1
Fix AVX and other SIMD support detection
2012-09-17 13:30:28 +04:00
Andrey Kamaev
fe0d07ae53
Add experimental support for desktop Java
...
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
2012-09-17 13:21:20 +04:00
Andrey Kamaev
ece71d6a06
Remove misused REQUIRED keyword from CMake scripts
2012-09-17 13:21:20 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
Vadim Pisarevsky
a6e2acbfee
added a few missing images for tutorials; integrated pull request #26
2012-08-30 16:23:18 +04:00
Anatoly Baksheev
0ba01afd83
added GPU bilateral filter + tests
...
added GPU non local means brute force filter + tests
2012-08-29 19:20:32 +04:00
Andrey Kamaev
bcf8dd510f
Added CCache support to Android build
...
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:
export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Anatoly Baksheev
d3f4c9b2dc
Fixed bug in BP_GPU
2012-08-24 18:38:54 +04:00
Anatoly Baksheev
290030d030
possibility to enable /mp compiler flag from cmake
...
fixed MCVC warnings
2012-08-23 16:53:53 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Vadim Pisarevsky
2f1cc018c9
enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays)
2012-08-21 17:39:40 +04:00
Sergiu Dotenco
ddc7bd7659
fixed compilation errors caused by std::tuple
2012-08-19 15:30:41 +02:00
Andrey Kamaev
bd33e166d0
Use git hash instead of svn version in cmake status report
2012-08-07 14:30:36 +04:00
yao
c03ac12fcd
Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries
2012-08-07 16:33:46 +08:00
Vadim Pisarevsky
9f4efab40a
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
2012-07-16 17:08:14 +00:00
Andrey Kamaev
6a13c9efc0
Added cmake for building Android package
2012-06-28 13:42:08 +00:00
Andrey Kamaev
15e50420bc
Fixed linux and android install
2012-06-27 13:52:29 +00:00
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Andrey Kamaev
55567582a6
added XIMEA support for linux (by Igor Kuzmin) #2085
2012-06-26 11:48:58 +00:00
Andrey Kamaev
a142a3b78a
Fixed Android Manager build
2012-06-26 08:48:45 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Andrey Kamaev
37212f5e00
Fixing compiler flags checks.
2012-06-12 15:14:28 +00:00
Andrey Kamaev
79df8db76f
Fixed recently introduced build problems on some platforms
2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
5b2db8e75b
Dragonfly BSD build fix #2010 (thanks to Thomas Klausner)
2012-06-04 06:19:56 +00:00
Andrey Kamaev
ca6d2fe76b
Moved 3rd-party libraries detection to separate cmake files
2012-05-25 13:12:02 +00:00
Andrey Kamaev
e161f428a0
Fixed PvAPI search on Windows #1927
2012-05-24 20:10:13 +00:00
Andrey Kamaev
0716ebb7a6
Refactored highgui libraries search (tested on Windows only)
2012-05-20 18:49:57 +00:00
Andrey Kamaev
094c32ced7
Refactored CMake status report for video IO libs
2012-05-19 13:48:36 +00:00
Andrey Kamaev
d069c062a6
Added Windows paths support to Eigen search.
2012-05-19 10:14:10 +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
Vladislav Vinogradov
91e312958b
disabled WITH_OPENGL flag under MacOS
2012-05-10 09:53:57 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Alexey Spizhevoy
306248e444
Added support of Clp for Windows
2012-04-16 11:10:41 +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
020f9a6047
Updated Clp library related code in CMakeLists.txt
2012-04-13 11:55:12 +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
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
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
eec70a7793
Architecture dependent library path on unix
2012-02-22 15:29:23 +00:00
Andrey Kamaev
4ac407e76a
Small refactoring of OpenCV cmake options
2012-02-22 14:04:59 +00:00
Andrey Kamaev
a8f27e4a84
Information about cmake and build platform is added to the status report
2012-02-21 12:42:51 +00:00
Andrey Kamaev
a6e8e5dd95
Fixed #1443
2012-02-17 19:09:05 +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
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
49933c798f
Fixed build for desktop
2012-02-06 11:48:15 +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
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
Vadim Pisarevsky
fd084a0a7e
fixed bug #1415
2012-01-27 20:36:19 +00:00
Vadim Pisarevsky
b33c9b10bc
fixed bug #1566
2012-01-27 20:28:59 +00:00
Andrey Kamaev
13f4e70e95
Updating opencv module definition in cmake
2012-01-24 16:55:47 +00:00
Andrey Kamaev
6f99447fbf
Fixed compiler flags caching in cmake
2012-01-24 11:46:11 +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
Andrey Morozov
209aaac95c
fixed parallel build under Windows
2011-12-19 13:20:34 +00:00
Andrey Morozov
ca5d28d127
added experimental feature for parallel build solution under Windows
2011-12-16 07:14:55 +00:00
Vladislav Vinogradov
3afc97e67e
fixed new OpenGL functionality under Qt
2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
2a4fb155e1
added OpenGL support to Gtk realization of highgui
2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3
fixed build with Qt
2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
2011-11-21 11:58:52 +00:00
Andrey Kamaev
d45f561ef5
Small improvements in cmake status report
2011-11-18 08:14:42 +00:00
Andrey Kamaev
a13dfc7f70
Fixed perf target
2011-11-18 07:57:14 +00:00
Andrey Kamaev
3bdb53e484
Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support.
2011-11-16 14:32:10 +00:00
Leonid Beynenson
59d89c7a7a
Added possibility to configure TBB behavior in Perf tests --- now we can set the number of TBB threads in the perf tests either as console parameter perf_tbb_nthreads or
...
in a test itself using the method declare.tbb_threads(n).
2011-10-31 16:22:05 +00:00
Vladislav Vinogradov
40ee754e28
added WITH_CUFFT and WITH_CUBLAS flags to cmake scripts
...
fixed gpu module error reporting
added asynchronous version of some functions
2011-10-19 09:53:22 +00:00
Alexander Shishkov
bb130d14bd
Changed type of OPENCV_BUILD_3RDPARTY_LIBS variable to the INTERNAL on WIndows
...
(see comments for #1030 ticket https://code.ros.org/trac/opencv/ticket/1030 )
2011-10-03 16:59:24 +00:00
Leonid Beynenson
fcaa587b67
CMake scripts changed a bit: added more accurate variant of the Threading Framework support (it is a lightweight analogue of TBB for ARM-s).
2011-09-27 16:25:13 +00:00
Andrey Kamaev
fb2c288627
Fixed some cmake 2.6 compatibility issues.
2011-09-18 15:30:36 +00:00
Andrey Kamaev
1917d8b006
Fixed perf target on Windows.
2011-09-08 06:27:46 +00:00
Andrey Kamaev
5cce038958
Performance testing branch is merged back into trunk
2011-09-06 15:30:28 +00:00
Andrey Kamaev
1f0035d2af
Fixed native_camera library build for Androids having version in x.x format
2011-09-01 14:39:26 +00:00
Artem Myagkov
abdd342d50
modifed minimum required cmake version for ios
2011-08-31 18:42:44 +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
3b7b833a4e
merged latest fixes from 2.3 branch; since 2.3.1 is out, the version in trunk is bumped to 2.3.2
2011-08-17 20:12:11 +00:00
Vadim Pisarevsky
d752c2b674
disabled fast-math by default.
2011-08-17 09:05:05 +00:00
Vadim Pisarevsky
bd0d8429ee
added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor.
2011-08-11 17:59:30 +00:00
Maria Dimashova
04e4eaabaf
updated openni finding by cmake ( #1190 , #1252 ); updated doc on kinect
2011-08-10 14:58:55 +00:00
Vadim Pisarevsky
f9ef92d45a
multilib support added (ticket #363 )
2011-08-10 12:49:52 +00:00
Maria Dimashova
7f1995f19a
fixed cmake status of openni
2011-08-10 11:59:37 +00:00
Andrey Kamaev
a0590273e9
Java API: fixed problems in video and ml modules; generated test stubs for all exported functions (now we have 1701 tests).
2011-08-05 08:39:28 +00:00
Andrey Kamaev
99b8e2db14
Java API: added tests for FAST feature detector
2011-08-02 14:32:43 +00:00
Vadim Pisarevsky
7c54ebfe1b
corrected OpenEXR status in CMakeLists.txt
2011-07-27 20:53:19 +00:00
Andrey Kamaev
8ab16f66a8
Fixing native camera for Android
2011-07-25 11:16:32 +00:00
Andrey Kamaev
a17b693aa9
Fixed build of Android samples and tests
2011-07-24 20:44:20 +00:00
Andrey Kamaev
712ea05058
Refactored CMakeLists.txt for java module
2011-07-22 13:10:50 +00:00
Andrey Kamaev
078eae7154
Added cmake dependency on version.hpp. From now cmake will automatically rerun if version.hpp file is changed.
2011-07-21 21:44:48 +00:00
Andrey Kamaev
f503b029a7
Allowed to build html documentation without pdf documentation.
2011-07-19 20:27:58 +00:00
Andrey Kamaev
066039fd15
Improved ANDROID_SDK_TARGET detection; improved NDK detection in android.toolchain.cmake
2011-07-13 13:06:14 +00:00
Andrey Kamaev
6c668dd704
Fixed Android SDK searching
2011-07-13 09:17:41 +00:00
Andrey Kamaev
355f6d0a73
Fixed Android SDK searching
2011-07-13 09:10:21 +00:00
Andrey Kamaev
6623fe3b08
Added option INSTALL_ANDROID_EXAMPLES (default off); Added option for choosing SDK platform for Android tests and samples.
2011-07-12 15:59:31 +00:00
Vadim Pisarevsky
569b1ad582
embeded cv Python module into cv2.
2011-07-12 12:56:03 +00:00
Andrey Kamaev
2dd965b7f5
minor cmake corrections
2011-07-12 07:40:29 +00:00
Alexander Shishkov
b50428bf65
removed -static-libstdc++ flag for compatibility with old MinGW version
2011-07-08 07:10:37 +00:00
Alexander Shishkov
3a8a729a52
removed CPack
...
added target package_source (tar or zip)
2011-07-08 07:08:59 +00:00
Vadim Pisarevsky
af00cd5b75
Disabled -ffast-math in the case of GCC 4.6.x (ticket #1201 )
2011-07-07 22:35:34 +00:00
Vadim Pisarevsky
db0dcaffeb
fixed #1204
2011-07-07 22:10:13 +00:00
Andrey Kamaev
ff8fe39e23
removed duplicated compiler flags assignment
2011-07-05 06:42:56 +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
d96f533784
Instroduced separate option for Android examples - BUILD_ANDROID_EXAMPLES
2011-07-04 08:18:02 +00:00
Andrey Kamaev
1c96aac52e
Fixed several cross-compiling issues. Fixed cmake status report.
2011-07-02 15:12:07 +00:00
Vadim Pisarevsky
f8e1e88ce2
we do not need strmiids.lib anymore
2011-07-01 14:03:03 +00:00
Andrey Kamaev
837b733a0a
Modified cmake status report
2011-07-01 12:23:03 +00:00
Vadim Pisarevsky
3cbe53c5d2
got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll)
2011-07-01 12:14:51 +00:00
Ethan Rublee
08d3dcc709
minor edits to cmake.
2011-07-01 00:57:00 +00:00
Ethan Rublee
38b5d4ecc9
Adding namemangling to the opencv.pc file.
2011-07-01 00:14:09 +00:00
Andrey Kamaev
529f103456
Merged name suffixes for windows (from 2.3 branch)
2011-06-30 19:45:52 +00:00
Andrey Kamaev
092699783a
Added cmake script to build Android samples
2011-06-30 13:37:56 +00:00
Andrey Kamaev
aa47802e88
Modified version section to read version number from version.hpp;
...
Added search for ant and Android SDK (needed for Android tests and samples).
2011-06-30 07:24:35 +00:00
Andrey Kamaev
96d29621b7
Fixes for path mangling feature
2011-06-29 06:27:08 +00:00
Ethan Rublee
773654e11a
More work on the mangling of install paths.
2011-06-28 19:24:31 +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
f60bdb2473
Fixed Android.mk file generation
2011-06-28 08:48:23 +00:00
Andrey Kamaev
822b0bfe22
Minor bugfix
2011-06-28 07:20:30 +00:00
Andrey Kamaev
591cb1b3cf
Fixed compiler options in Android build (Windows)
2011-06-28 05:51:41 +00:00
Andrey Kamaev
ba7ee71c20
Numerous small fixes in CMakeLists.txt
2011-06-28 05:18:53 +00:00
Andrey Kamaev
cf28846bce
Fixed OpenCVConfig.cmake generation for windows
2011-06-27 16:55:10 +00:00
Andrey Kamaev
31fcd406e1
Eliminated cmake warning for case when python is not found.
2011-06-27 16:21:22 +00:00
Andrey Kamaev
b43ae03328
* Install path share/opencv is renamed to share/OpenCV.
...
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
2011-06-27 13:59:03 +00:00
Andrey Kamaev
f0227edd2c
Minor python search improvements
2011-06-27 08:24:10 +00:00
Vadim Pisarevsky
d195871904
propagated fix for ticket #1168 to trunk
2011-06-25 09:39:41 +00:00
Andrey Kamaev
c1940b4ec7
Modified install layout for Android
2011-06-24 15:40:27 +00:00
Andrey Kamaev
69b79f89c1
Updated build scripts for better Java module support
2011-06-24 07:48:04 +00:00
Andrey Kamaev
e60b8dfba0
Fixed numpy search on Windows x64
2011-06-23 09:16:55 +00:00
Andrey Kamaev
9600ebadf2
Main CMakeLists.txt merged with 2.3 branch
2011-06-22 11:53:15 +00:00
Andrey Kamaev
76bc9f8c20
Removed SWIG from Android toolchain; always search for python; find_program/find_package cmake functions wrapped for case of cross-compiling.
2011-06-22 10:38:57 +00:00
