Andrey Kamaev
f22ee7f0df
Workaround "Segmentation fault" when built with gcc 4.7 from NDK r8d
2012-12-21 16:44:54 +04:00
Andrey Kamaev
b6efec5f8b
Add support for Android NDK r8d
2012-12-21 15:39:23 +04:00
Andrey Kamaev
8763ad6c99
Fix ccache search in Android CMake toolchain.
2012-12-19 16:50:08 +04:00
Andrey Kamaev
cbe22fb5d1
Android: always sort list of NDK toolchains
...
Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
2012-11-27 18:16:36 +04:00
Andrey Kamaev
ab9311947a
Update Android CMake toolchain for NDK r8c
2012-11-20 15:20:04 +04:00
Andrey Kamaev
c46affe63e
android.toolchain.cmake: restore implicit link with math library for C++ objects
...
Ticket #2426
2012-10-11 16:10:01 +04:00
Andrey Kamaev
1e69d47ba5
Remove -g from Android complier flags in release mode (used by NDK but inconvenient for CMake)
2012-09-13 20:27:54 +04:00
Andrey Kamaev
4bd2c6b50d
Android toolchain: added fixes/workarounds for NDK r8b and NDK r6 bugs
2012-09-07 18:27:47 +04:00
Andrey Kamaev
2cc262bce4
Fix Android CMake toolchain compiler and linker flags
2012-09-06 18:54:38 +04:00
Andrey Kamaev
d3501f1545
Android toolchain: restored explicit include_directories of system /usr/include
...
It is needed because of explicit STL include paths.
Otherwise some standard headers (like fenv.h) can not not be correctly found by the compiler.
2012-09-05 16:29:05 +04:00
Andrey Kamaev
b0c7280978
Android toolchain: protect from changes of NDK_CCACHE on subsequent cmake
2012-09-04 16:33:24 +04:00
Andrey Kamaev
53d219c857
Improved CMake warnings about known problems of Android NDKs
2012-09-04 16:21:44 +04:00
Andrey Kamaev
a3125c0b8d
Added C++ runtime search for standalone toolchain
2012-09-04 02:08:27 +04:00
Andrey Kamaev
ac808b51a5
Fixing STL support in case of standalone toolchain
2012-09-03 19:13:51 +04:00
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 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
Andrey Kamaev
cddac5d221
Android toolchain: fixed try_compile problem with old cmake versions
2012-06-14 14:38:04 +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
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
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
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
e46e13a775
Fixed typo in android toolchain
2011-12-27 09:11:42 +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
