Commit Graph

50 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
01570fa800 merged Android Manager and new java layout 2012-06-28 16:23:19 +00:00
Marina Kolpakova
680a44189c merged the trunk r8704:8716 2012-06-28 16:13:29 +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
cddadc04b7 Fixed Android manifest install 2012-04-23 12:39:18 +00:00
Andrey Kamaev
78ee81c409 Fixed dependency from opencv_nonfree in Java bindings 2012-04-18 12:58:42 +00:00
Andrey Kamaev
6d00182e13 Fixed Android build with correct manifest file 2012-04-16 13:30:35 +00:00
Andrey Kamaev
f9da906144 Fixed Android manifest generation and Android samples install 2012-04-16 09:14:26 +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