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
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
2012-06-28 17:07:17 +00:00
Marina Kolpakova
01570fa800
merged Android Manager and new java layout
2012-06-28 16:23:19 +00:00
Andrey Kamaev
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
2012-05-30 08:04:37 +00:00
Andrey Kamaev
f9da906144
Fixed Android manifest generation and Android samples install
2012-04-16 09:14:26 +00:00
Andrey Kamaev
00de4b9314
Fixed compiler flags caching in toolchain; fixed zlib search.
2012-04-16 07:24:15 +00:00
Andrey Kamaev
f7853b262b
Fixed cmake configuration for Android for case when only one SDK target is available #1781
2012-04-09 14:51:14 +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
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
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
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
01b986ef32
Fixed try_compile for Android; Fixed samples build
2012-02-24 09:35:59 +00:00
Andrey Kamaev
b294383199
Added more default search locations for Android NDK and SDK
2012-02-20 14:50:23 +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
