Alexander Smorkalov
215f78eee2
Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep
2014-01-31 22:25:36 +04:00
Alexander Smorkalov
48d9be70d5
Android toolchain file sync with original project.
...
Original project: https://github.com/taka-no-me/android-cmake/
Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a
(cherry picked from commit c8150436073a4c25ec4f4273b80c1b76201b8be1)
2014-01-31 22:21:34 +04:00
Alexander Smorkalov
c6b31481b6
OpenCV Manager version++.
2014-01-31 12:15:22 +04:00
Alexander Smorkalov
3ebdcafdd3
All installed files marked with component names for install customization.
...
(cherry picked from commit b75cbfde45c00fc956f033d0af7fe6d63312fd33)
Conflicts:
cmake/OpenCVModule.cmake
2014-01-24 17:13:22 +04:00
Roman Donchenko
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
2013-12-25 14:04:44 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Alexander Smorkalov
9f04222a75
OpenCV Manager version++.
2013-12-06 18:53:03 +04:00
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
Alexander Smorkalov
bd314bf955
VFPv4 detection implemented. Some Tegra5 related updates.
2013-11-22 14:30:23 +04:00
Alexander Smorkalov
fd759223fa
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
2013-11-22 11:46:18 +04:00
Alexander Smorkalov
e08b075db0
Android NDK r9b support added.
2013-11-19 11:46:29 +04:00
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
2013-11-06 14:24:18 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Roman Donchenko
e1c8f5d723
Removed a stray comma in the Android toolchain file.
...
It was actually acting as an additional argument, breaking the error message.
2013-10-25 13:50:22 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
aa00b5a0ab
New Tegra detector with Android 4.3 support added. Manager version++.
2013-08-28 15:22:14 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Alexander Smorkalov
e905c81ccc
OpenCV Manager version++.
2013-07-05 12:07:04 +04:00
Alexander Smorkalov
8b6f1d9bd9
OpenCV Version++; Manager Version++
2013-06-28 18:25:53 +04:00
Alexander Smorkalov
e241c14b94
OpenCV Library and Manager version incremented.
...
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
2013-06-27 12:05:25 +04:00
Alexander Smorkalov
80f6ede233
Fix build problems on MIPS and Linaro NDK.
...
Merged android.toolchain.cmake from project
https://github.com/taka-no-me/android-cmake
commit: fd1f7055f8b7338644d58d9a2015a784dfa3a5ca
2013-06-13 16:51:45 +04:00
Alexander Smorkalov
f85cf5bdd9
Build fixes. Build scrips reorganized.
2013-05-28 12:27:56 +04:00
Alexander Smorkalov
20fef00a77
android -> plarforms/android
2013-05-27 11:10:38 +04:00
