Commit Graph

46 Commits

Author SHA1 Message Date
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
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 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 0067c755dd Minor android.toolchain.cmake enhancement 2011-07-21 21:43:41 +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 1c96aac52e Fixed several cross-compiling issues. Fixed cmake status report. 2011-07-02 15:12:07 +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 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 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 4c7a8f8d24 Updated Android cross-compilation on Windows. 2011-05-09 23:22:46 +00:00
Andrey Kamaev 05ece2433e Fixed Android API level detection for toolchain build 2011-05-06 16:15:10 +00:00
Andrey Kamaev 727fbd5376 Android cmake toolchain file is included into OpenCV 2011-05-03 08:13:50 +00:00