Andrey Kamaev
c91850ec2e
Fix executable and C objects linking
2012-09-03 18:42:13 +04:00
Andrey Kamaev
e402bb496d
Add support for all NDK runtimes
2012-09-03 03:54:06 +04:00
Andrey Kamaev
21a536f999
Add NDK release detection into CMake toolchain
2012-09-02 19:56:12 +04:00
Andrey Kamaev
c9dbb0d314
Several small fixes in Android CMake toolchain
...
* fix formatting
* honor Windows-style paths
* suppress warnings inside try_compile
* correct caching of toolchain variables
2012-09-02 18:59:41 +04:00
Andrey Kamaev
e9392d1466
Fix Android build with cmake 2.6.3
2012-08-30 00:23:41 +04:00
Andrey Kamaev
0adbead654
Android toolchain: fix CCache program search
2012-08-28 20:39:10 +04:00
Andrey Kamaev
d421ec26e2
Android toolchain: fixed ccache search
2012-08-28 13:26:57 +04:00
Andrey Kamaev
bbbe77e05e
Fix Android build for mips platform
2012-08-27 20:16:54 +04:00
Andrey Kamaev
c0786e9d33
Support for the gold linker (NDK r8b is required)
2012-08-27 19:45:24 +04:00
Andrey Kamaev
bcf8dd510f
Added CCache support to Android build
...
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:
export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Andrey Kamaev
6da9b9f137
Android toolchain: libstdc++ and libsupc are removed from explicit link libraries
...
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
# (use "git reset HEAD^1 <file>..." to unstage)
#
# modified: android/android.toolchain.cmake
#
2012-08-17 16:23:57 +04:00
Andrey Pavlenko
c1571e21ff
android tutorial v2, initial draft commit
2012-08-07 17:27:48 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Andrey Kamaev
bc227ab075
Intermediate files generated by Android toolchain are moved into CMakeFiles subfolder
2012-08-06 19:10:55 +04:00
andrey.kamaev
5b4297cccf
Android CMake toolchain is updated for NDK r8b
2012-08-03 17:00:46 +04:00
Alexander Smorkalov
ddcc839519
Tegra3 package support enabled;
...
Version code incremented;
2012-07-16 07:56:12 +00:00
Andrey Kamaev
bb51626573
Build pdf for Android Manager documentation
2012-07-13 13:00:29 +00:00
Andrey Pavlenko
be2457c249
removing 'module' directive to eliminate "PYTHON MODULE INDEX" page in PDF
2012-07-13 08:39:31 +00:00
Alexander Smorkalov
76fdbeee8a
Tegra detector fixed;
...
Some aditional logs added;
AndroidManifest version incremented.
2012-07-12 13:12:16 +00:00
Alexander Smorkalov
9f0a16c844
HW compatibility tests added;
...
Arm-v7a neon package support enabled.
2012-07-12 11:50:40 +00:00
Andrey Pavlenko
76cb051082
better wording
2012-07-12 09:21:39 +00:00
Andrey Pavlenko
cacf1d1ed3
adding java api ref. to top-level index
2012-07-12 09:21:29 +00:00
Alexander Smorkalov
422f650b20
Package name logic improved;
...
Aditional tests added;
Some bug fixes with different __SUPPORT_XXX defines.
2012-07-12 08:02:41 +00:00
Alexander Smorkalov
ed0a158cc1
Unit tests updated. Version and HW compatiblity tests added;
...
Tegra3, neon, sseX, x64 support uncomment and guarded by ifdefs.
2012-07-11 13:30:41 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Andrey Kamaev
a4ec89fb2c
Merged version references fix
2012-07-02 15:41:14 +00:00
Andrey Kamaev
efe139667b
Fixed Android package dependencies
2012-07-02 13:26:51 +00:00
Andrey Kamaev
08890118db
Fixed Android package dependencies
2012-07-02 13:19:46 +00:00
Andrey Kamaev
4216f3b24c
Fixed Android package dependencies
2012-07-02 13:17:12 +00:00
Andrey Kamaev
6a13c9efc0
Added cmake for building Android package
2012-06-28 13:42:08 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Andrey Kamaev
a142a3b78a
Fixed Android Manager build
2012-06-26 08:48:45 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Andrey Kamaev
cddac5d221
Android toolchain: fixed try_compile problem with old cmake versions
2012-06-14 14:38:04 +00:00
Andrey Kamaev
a91745558f
Updated link in android readme
2012-06-06 09:15:14 +00:00
Andrey Kamaev
b8804ccc17
Fixed problem with manually set PYTHON_PACKAGES_PATH #1891
2012-05-18 07:43:12 +00:00
Andrey Kamaev
0fecbdde6e
Added Android NDK r8 support including new mips ABI
2012-05-03 10:40:29 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexander Smorkalov
abbfa848ba
Issue 1119 Build for x86. Build script added. Tests are ok.
2012-04-02 09:44:36 +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
b232ffcde7
Android: removed unneeded workaround for library output path initialization.
2012-03-13 15:50:11 +00:00
Andrey Kamaev
603e3e4bc0
Fixed bugs in Android cmake toolchain; added experimantal assembler support to the toolchain
2012-03-12 16:17:42 +00:00
Andrey Kamaev
90dcd4608c
Android: fixed cmake try_compile() for case of STL features detection
2012-03-04 20:36:50 +00:00
Andrey Kamaev
631f72d85d
Fixed Android cross-compiling problems:
...
- missing install_name_tool on OS X
- incorrectly working try_compile() command
2012-03-04 12:30:03 +00:00
Andrey Kamaev
228b87250a
Windows build scripts for Android are updated for SDK r14 and newer
2012-02-24 09:39:28 +00:00
Andrey Kamaev
01b986ef32
Fixed try_compile for Android; Fixed samples build
2012-02-24 09:35:59 +00:00
Andrey Kamaev
a8f27e4a84
Information about cmake and build platform is added to the status report
2012-02-21 12:42:51 +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
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
2012-02-16 20:29:35 +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
504a93ed0a
Alternative xml naming for performance logs
2012-01-23 16:28:46 +00:00
Andrey Kamaev
ae2e494c7d
A number of improvements in android cmake toolchain
2012-01-20 14:35:57 +00:00
Andrey Kamaev
a43c47d6cf
First version of native camera support for Android 3.x.x and 4.0.x
2012-01-18 14:33:39 +00:00
Andrey Kamaev
8cab65c173
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
2012-01-03 13:48:12 +00:00
Andrey Kamaev
e46e13a775
Fixed typo in android toolchain
2011-12-27 09:11:42 +00:00
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
2011-11-21 11:58:52 +00:00
Andrey Kamaev
d55a56d12d
Updated comment
2011-11-21 10:55:55 +00:00
Andrey Kamaev
7172c8cea9
Android cmake toolchain: fixed some compatibility problems with cmake 2.6.x; improved file header.
...
Fixed small problem in chart.py.
2011-11-19 18:02:00 +00:00
Andrey Kamaev
eb1790e5f1
Fixed Android build on Windows.
2011-11-17 20:43:14 +00:00
Andrey Kamaev
b114fb54f9
Android cmake toolchain: changed some error messages, fixed error with NDK r5, improved includes and link directories configuration
2011-11-17 15:28:11 +00:00
Andrey Kamaev
3bdb53e484
Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support.
2011-11-16 14:32:10 +00:00
Andrey Kamaev
e8032fa8e9
Fixed Android build with SDK revision 14
2011-10-21 08:35:34 +00:00
Andrey Kamaev
fb2c288627
Fixed some cmake 2.6 compatibility issues.
2011-09-18 15:30:36 +00:00
Andrey Kamaev
d4c094745f
Android port is updated for NDK r6b
2011-09-02 11:13:32 +00:00
Andrey Kamaev
e553a37fe7
Removed outdated android-opencv subproject
2011-08-09 11:55:43 +00:00
Andrey Kamaev
322b09fc12
Removed outdated stuff from Android build scripts
2011-07-25 13:42:23 +00:00
Andrey Kamaev
712ea05058
Refactored CMakeLists.txt for java module
2011-07-22 13:10:50 +00:00
Kirill Kornyakov
ed96af94cc
added mk files for NDK-builder of opencv_java project
2011-07-22 10:44:40 +00:00
Andrey Kamaev
0067c755dd
Minor android.toolchain.cmake enhancement
2011-07-21 21:43:41 +00:00
Andrey Kamaev
7c6fc6e18a
Android samples are renamed
2011-07-15 15:56:08 +00:00
Andrey Kamaev
39dab5e0cf
Headers are included into opencv_java build
2011-07-15 15:26:29 +00:00
Andrey Kamaev
85c8a69fdf
Fixed Android packaging script
2011-07-14 10:03:19 +00:00
Andrey Kamaev
20ec29f22e
Android samples are included into the Android package
2011-07-14 09:34:57 +00:00
Andrey Kamaev
a70f354c0f
Andoid build fixed
2011-07-14 08:57:46 +00:00
Andrey Kamaev
0b57d904db
Fixed Android compilation on Windows
2011-07-14 07:44:33 +00:00
Andrey Kamaev
87cfcc8ee2
Fixed Android build
2011-07-14 07:04:36 +00:00
Andrey Kamaev
0b6fed32e3
Allowed spaces in Android NDK path
2011-07-13 14:48:16 +00:00
Andrey Kamaev
066039fd15
Improved ANDROID_SDK_TARGET detection; improved NDK detection in android.toolchain.cmake
2011-07-13 13:06:14 +00:00
Andrey Kamaev
ecfc8e97db
Android toolchain default NDK path is updated for version r6
2011-07-12 17:20:48 +00:00
Andrey Kamaev
bee4c347ba
Fixed bug with ARM_TARGET caching
2011-07-12 16:22:52 +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 Kamaev
7159845021
Added packaging script for Android
2011-07-12 12:59:26 +00:00
Andrey Kamaev
1c96aac52e
Fixed several cross-compiling issues. Fixed cmake status report.
2011-07-02 15:12:07 +00:00
Andrey Kamaev
f8e42721d3
HelloAndroid sample is moved to samples/android
2011-07-01 13:12:05 +00:00
Andrey Kamaev
092699783a
Added cmake script to build Android samples
2011-06-30 13:37:56 +00:00
Andrey Kamaev
ba7ee71c20
Numerous small fixes in CMakeLists.txt
2011-06-28 05:18:53 +00:00
Andrey Kamaev
c1940b4ec7
Modified install layout for Android
2011-06-24 15:40:27 +00:00
Andrey Kamaev
b5d73111eb
Added new module for Java API
2011-06-23 15:51:51 +00:00
Andrey Kamaev
725d771570
Fixed output paths for Android build
2011-06-22 13:27:28 +00:00
Andrey Kamaev
76bc9f8c20
Removed SWIG from Android toolchain; always search for python; find_program/find_package cmake functions wrapped for case of cross-compiling.
2011-06-22 10:38:57 +00:00
Andrey Kamaev
9c71134caf
Added generation of OpenCV.mk file for Android development with ndk-build tool
2011-06-20 15:35:05 +00:00
Andrey Kamaev
092beae2d5
Updated NDK default paths for version r5c
2011-06-16 20:25:15 +00:00
Andrey Kamaev
206aa50f86
Added Android native camera module
2011-06-16 18:00:41 +00:00
Andrey Kamaev
c7bdf83de5
Fixed Android build
2011-06-03 12:01:55 +00:00
Andrey Kamaev
2f3b75c841
Fixed windows build scripts in HelloAndroid sample.
2011-05-28 19:30:41 +00:00
Andrey Kamaev
166bfdda45
Updated build scripts for HelloAndroid sample.
2011-05-28 18:42:58 +00:00
Ethan Rublee
72728b4481
Applying patch mentioned in ticket #1085
2011-05-23 19:52:23 +00:00
Kirill Kornyakov
8a47b3d5d5
fixed OpenCV_DIR
2011-05-18 12:48:08 +00:00