Commit Graph

86 Commits

Author SHA1 Message Date
Maksim Shabunin eebd4cad66 Fix compilation problems with XCode 7.1.1 and cmake 3.3.2 2015-11-17 18:52:55 +03:00
Roman Donchenko 0dad2876e2 Removed all use of the obsolete IMMEDIATE parameter to configure_file.
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):

https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
Alexander Smorkalov b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
Alexander Smorkalov 5a5c82bb1d Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring. 2013-12-19 17:41:04 +04:00
Alexander Smorkalov 037ffcdf99 Dynamic CUDA support library reimplemented as OpenCV module. 2013-12-19 16:42:11 +04:00
Roman Donchenko 641bb7ac6b Merge pull request #1737 from vrabaud:2.4 2013-11-07 12:03:30 +04:00
Vincent Rabaud 0b1df62215 add VERBATIM as advised by @SpecLad 2013-11-05 12:02:22 +01:00
Vincent Rabaud 3b0108e4c1 fix the crash as suggested by @SpecLad 2013-11-05 11:18:20 +01:00
Vincent Rabaud e1b2f593d6 fix crash when path has spaces
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
2013-11-01 19:30:58 +01:00
Alexander Smorkalov 994e07db07 Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
2013-10-30 12:51:49 +04:00
Alexander Alekhin 4b17d073c0 cmake: fix linker dependencies for opencv_java
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
2013-10-24 19:04:59 +04:00
Alexander Alekhin 2a9d24323c cmake: add opencv_java into list of exported targets (fix for android) 2013-10-16 17:23:44 +04:00
Alexander Alekhin bc089bb18c cmake: update java module install rules 2013-10-09 17:49:11 +04:00
Alexander Smorkalov 98cb1dcc9a MediaRecorder hint enabled for all Android devices with API level 14 and above.
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
2013-09-10 18:05:45 +04:00
Andrey Kamaev eeaa1e8751 Fix link of fat java wrapper on OS X 2013-04-03 20:02:13 +04:00
Andrey Pavlenko 0e64baaec5 removing redundant code 2013-03-06 13:00:00 +04:00
Andrey Pavlenko 116d3be9c0 moving JNI library to 'build/lib' dir on non-Win 2013-03-05 18:41:44 +04:00
Andrey Pavlenko 5321da92cb adding/fixing version suffix for desktop java library on all OSes 2013-02-28 16:12:44 +04:00
Andrey Kamaev 059ea5bebe Merge pull request #471 from apavlenko:jar_install 2013-02-11 20:46:48 +04:00
Andrey Pavlenko b337d84adf configure desktop Java install, making JNI library name correct, and making it fat when possible 2013-02-11 16:28:19 +04:00
Andrey Kamaev 571665b559 Fix CMake variables substitution in Android project files 2013-02-08 18:21:49 +04:00
Andrey Kamaev 2c32536bf4 Enable Java bindings on all platforms by default 2013-01-23 18:08:09 +04:00
Andrey Kamaev 3889b34ec3 Add option to run java tests with run.py 2013-01-23 18:08:08 +04:00
Andrey Kamaev 46c4390a2e Hardly refactored CMake script for Java wrappers 2013-01-22 17:59:01 +04:00
Andrey Kamaev c92743d124 Eliminate intermediate build target "opencv_java_api" 2013-01-22 17:59:00 +04:00
Andrey Kamaev e3474878b6 Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00
Eric Christiansen ad326cb0be adds desktop java junit tests 2012-12-19 14:28:59 -08:00
Alexander Smorkalov 641ee645ab New sample framework integrated to Java part of SDK;
Frame format setter added to both views.
2012-10-23 20:06:33 +04:00
Andrey Kamaev 8f44f25f47 Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt) 2012-10-11 17:09:57 +04:00
Andrey Kamaev 7cb525d63f Fix AndroidManifest.xml generation for OpenCV Android library project 2012-10-11 15:47:57 +04:00
Alexander Smorkalov 9a76573172 Auto expand of OpenCV version for Android Library prject and some documentation pages added. 2012-10-09 18:30:58 +04:00
Andrey Kamaev cd05d9aaad Fix build of Java API for Windows 2012-09-17 13:21:20 +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 af415085d8 Fix Android build with CMake 2.6.3-2.8.3 2012-09-04 16:21:44 +04:00
Andrey Kamaev 5c01d13f38 Pass list of modules to javadoc generator
Previously the generator always uses hardcoded list of modules.
This fix replaces hardcoded list with actual set of modules coming from cmake.
2012-08-27 16:48:09 +04:00
Alexander Smorkalov 14fa645026 Debug build for Android added. Stripping of debug build turned off. 2012-08-14 12:03:05 +04:00
Andrey Kamaev 620d122fc2 Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings 2012-07-05 07:58:40 +00:00
Andrey Kamaev 71729a5967 opencv_ts is removed for java API 2012-06-29 08:11:20 +00:00
Andrey Kamaev 739da31add Fixed Android build with SDK tools revision 20 2012-06-28 11:06:31 +00:00
Andrey Pavlenko 3804ca3e20 changing package layout after 'make install' for Android build 2012-06-27 06:22:26 +00:00
Andrey Pavlenko 2984fa751e adding OpenCV Manager 2012-06-21 14:50:05 +00:00
Andrey Pavlenko 952b25f86f changing 'java' module layout 2012-06-21 11:44:31 +00:00
Andrey Kamaev d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Andrey Kamaev 2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Vadim Pisarevsky d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +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
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
Andrey Pavlenko 20cceb8fdf moving the rest of inpaint() to the 'photo' module, temporary disabling Java test for it, adding 'photo' to Java API 2012-03-16 15:11:56 +00:00