Alexander Smorkalov
65b53f96d0
OpenCV 2.4.0 constant version removed. All docs and samples updated for 2.4.2.
13 years ago
Andrey Kamaev
a4ec89fb2c
Merged version references fix
13 years ago
Andrey Kamaev
de153f0154
Fixed several opencv version references
13 years ago
Andrey Kamaev
af912f4843
Merged the trunk r8901:8904
13 years ago
Andrey Kamaev
efe139667b
Fixed Android package dependencies
13 years ago
Andrey Kamaev
08890118db
Fixed Android package dependencies
13 years ago
Andrey Kamaev
4216f3b24c
Fixed Android package dependencies
13 years ago
Andrey Kamaev
35a31e1c35
Fixed few warnings
13 years ago
Marina Kolpakova
54ee92e3b0
merged trunk r8815:8827
13 years ago
Marina Kolpakova
b28b2428f6
changing package layout after 'make install' for Android build
13 years ago
Marina Kolpakova
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
13 years ago
Marina Kolpakova
01570fa800
merged Android Manager and new java layout
13 years ago
Andrey Kamaev
6a13c9efc0
Added cmake for building Android package
13 years ago
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
13 years ago
Andrey Kamaev
a142a3b78a
Fixed Android Manager build
13 years ago
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
13 years ago
Andrey Kamaev
f666bd221f
Merged the trunk r8595:8668 (except iOS and new gpu functionality)
13 years ago
Andrey Kamaev
ab20da0f53
Merged the trunk r8547:8574, r8587
13 years ago
Andrey Kamaev
cddac5d221
Android toolchain: fixed try_compile problem with old cmake versions
13 years ago
Andrey Kamaev
a91745558f
Updated link in android readme
13 years ago
Andrey Kamaev
e1c4fd9e1f
Merged the trunk r8345:8376
13 years ago
Andrey Kamaev
c3577a288b
Merged the trunk r8291:8321
13 years ago
Andrey Kamaev
50ad690993
Merged the trunk till r8291
13 years ago
Andrey Kamaev
b8804ccc17
Fixed problem with manually set PYTHON_PACKAGES_PATH #1891
13 years ago
Andrey Kamaev
0fecbdde6e
Added Android NDK r8 support including new mips ABI
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Pavlenko
a227746d84
removing extra quotes that causes build failure
13 years ago
Andrey Kamaev
bf8c4a27be
Android build scripts for Windows are updated to recognize ninja
13 years ago
Andrey Kamaev
44098b2fbb
#1813 fixed compiler options with profiling enabled
13 years ago
Andrey Kamaev
00de4b9314
Fixed compiler flags caching in toolchain; fixed zlib search.
13 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Andrey Kamaev
f5d327362b
Android toolchain is updated for NDK r7c
13 years ago
Alexander Smorkalov
abbfa848ba
Issue 1119 Build for x86. Build script added. Tests are ok.
13 years ago
Andrey Kamaev
305d024137
CMake status report: list unsatisfied dependencies for automatically disabled modules; fixed few problems with Windows-style paths
13 years ago
Andrey Kamaev
b232ffcde7
Android: removed unneeded workaround for library output path initialization.
13 years ago
Andrey Kamaev
603e3e4bc0
Fixed bugs in Android cmake toolchain; added experimantal assembler support to the toolchain
13 years ago
Andrey Kamaev
90dcd4608c
Android: fixed cmake try_compile() for case of STL features detection
13 years ago
Andrey Kamaev
631f72d85d
Fixed Android cross-compiling problems:
...
- missing install_name_tool on OS X
- incorrectly working try_compile() command
13 years ago
Andrey Kamaev
228b87250a
Windows build scripts for Android are updated for SDK r14 and newer
13 years ago
Andrey Kamaev
01b986ef32
Fixed try_compile for Android; Fixed samples build
13 years ago
Andrey Kamaev
a8f27e4a84
Information about cmake and build platform is added to the status report
13 years ago
Andrey Kamaev
b294383199
Added more default search locations for Android NDK and SDK
13 years ago
Andrey Kamaev
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
13 years ago
Andrey Kamaev
23af203e00
Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
13 years ago
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
13 years ago
Andrey Kamaev
504a93ed0a
Alternative xml naming for performance logs
13 years ago
Andrey Kamaev
ae2e494c7d
A number of improvements in android cmake toolchain
13 years ago
Andrey Kamaev
a43c47d6cf
First version of native camera support for Android 3.x.x and 4.0.x
13 years ago
Andrey Kamaev
8cab65c173
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
13 years ago
Andrey Kamaev
e46e13a775
Fixed typo in android toolchain
13 years ago