Alexander Alekhin
87a98e4562
cmake: CMP0026 NEW
7 years ago
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
7 years ago
Alexander Alekhin
4d17051f14
android: backport Android SDK build script
8 years ago
Alexander Alekhin
c6be51eecd
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
9 years ago
Alexander Alekhin
777e1d38ba
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
9 years ago
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
9 years ago
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
9 years ago
Alexander Alekhin
b15a9d675e
cmake: use copy_if_different
9 years ago
Maksim Shabunin
caffbaafbe
Updated Manager for Android
10 years ago
Alexander Alekhin
55188fe991
world fix
10 years ago
Alexander Alekhin
15b6fd2ec4
android: allow to build & run examples without Android OpenCV Manager
11 years ago
Alexander Smorkalov
284b2fc1e7
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
11 years ago
Alexander Smorkalov
a49beb7c73
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
(cherry picked from commit 6ae4a9b09b
)
11 years ago
Alexander Smorkalov
51dff5b9e8
project.properties file generation fixed for per-component installation.
...
(cherry picked from commit 65b4d77959
)
11 years ago
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
11 years ago
Alexander Smorkalov
65b4d77959
project.properties file generation fixed for per-component installation.
11 years ago
Alexander Smorkalov
3ebdcafdd3
All installed files marked with component names for install customization.
...
(cherry picked from commit b75cbfde45
)
Conflicts:
cmake/OpenCVModule.cmake
11 years ago
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
11 years ago
Roman Donchenko
59dd5aea00
Reenabled adding native app glue for Android samples.
11 years ago
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
12 years ago
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
12 years ago
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
12 years ago
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
12 years ago
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
12 years ago
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
12 years ago
Alexander Smorkalov
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
12 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
12 years ago
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
12 years ago
Alexander Smorkalov
9314e3266c
Debug build for Android added. Stripping of debug build turned off.
12 years ago
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
12 years ago
Andrey Kamaev
af912f4843
Merged the trunk r8901:8904
13 years ago
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
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
739da31add
Fixed Android build with SDK tools revision 20
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
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
13 years ago
Andrey Kamaev
5a3cbadfe3
Fixing Android SDK search on OS X.
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
f9da906144
Fixed Android manifest generation and Android samples install
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
f7853b262b
Fixed cmake configuration for Android for case when only one SDK target is available #1781
13 years ago
Andrey Kamaev
c648de0e08
Fixed build error in Android examples when java bindings are excluded from build.
13 years ago
Andrey Kamaev
e72a23243b
Reworked build scripts for Android Java API, tests and examples
13 years ago