Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
eeaa1e8751
Fix link of fat java wrapper on OS X
2013-04-03 20:02:13 +04:00
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
2013-03-22 22:14:33 +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
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
00db5a69a2
More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
2012-02-20 11:50:43 +00:00
Andrey Kamaev
c19d0b17de
Fixed typo
2012-02-06 12:45:11 +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
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
2012-01-25 09:04:49 +00:00
Andrey Kamaev
4525ce56c3
Fixed Android target setup for OpenCv library project
2011-12-01 12:27:03 +00:00
Andrey Kamaev
e8032fa8e9
Fixed Android build with SDK revision 14
2011-10-21 08:35:34 +00:00
Andrey Kamaev
a4af33758d
Added Android tests coverage calculation into build
2011-07-26 08:17:52 +00:00
Kirill Kornyakov
d0cac8a93a
bugfix in cmake for java api
2011-07-25 07:47:18 +00:00
Andrey Kamaev
a17b693aa9
Fixed build of Android samples and tests
2011-07-24 20:44:20 +00:00
Andrey Kamaev
8378ba7554
Fixed Android package build
2011-07-22 14:11:16 +00:00
Andrey Kamaev
ebf9916242
Fixed android samples; fixed cmake files
2011-07-22 13:34:25 +00:00
Andrey Kamaev
712ea05058
Refactored CMakeLists.txt for java module
2011-07-22 13:10:50 +00:00
Andrey Kamaev
e9458c1f6d
Errors from javadoc generator are redirected to log file.
2011-07-22 06:13:04 +00:00
Andrey Kamaev
05ff8217e0
Removed debug print form cmake
2011-07-19 17:09:44 +00:00
Andrey Kamaev
930b2995eb
Fixed Android samples; Fixed bugs in cmake (java module).
2011-07-19 17:07:01 +00:00
Andrey Kamaev
dfdb15be79
Added Java packages support to cmake
2011-07-19 15:37:17 +00:00
Andrey Kamaev
39dab5e0cf
Headers are included into opencv_java build
2011-07-15 15:26:29 +00:00
Andrey Kamaev
4d8a261d99
Allowed spaces in path to OpenCV (tested only Android build)
2011-07-13 15:47:04 +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
Andrey Pavlenko
b5d864f579
'clib3d' support added
2011-07-11 08:33:12 +00:00
Andrey Kamaev
fbed6d1d44
Javadoc comments genearion is integrated into the Java API build
2011-07-08 15:29:59 +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
65cb53aa1e
Fixed Android tests and samples build
2011-07-04 06:33:10 +00:00
Andrey Kamaev
01b3266612
Fixed Android target name for Android samples and tests
2011-06-30 14:56:39 +00:00
Andrey Kamaev
a44d6aacc8
Android tests are included into cmake build
2011-06-30 14:35:35 +00:00
Andrey Kamaev
092699783a
Added cmake script to build Android samples
2011-06-30 13:37:56 +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
Andrey Kamaev
c1940b4ec7
Modified install layout for Android
2011-06-24 15:40:27 +00:00
Andrey Kamaev
2edf764eee
Added video.hpp header (for convenience with other modules); added option to specify list of headers for Java API generator
2011-06-24 08:13:02 +00:00
Andrey Kamaev
69b79f89c1
Updated build scripts for better Java module support
2011-06-24 07:48:04 +00:00
Andrey Kamaev
b5d73111eb
Added new module for Java API
2011-06-23 15:51:51 +00:00
