Commit Graph

37 Commits

Author SHA1 Message Date
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC

see CMP0023 (CMake 2.8.12+)

* cmake: fix 3rdparty list

- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Alexander Alekhin
18151e79bb cmake(samples): use LINK_PRIVATE in target_link_libraries 2019-05-15 18:38:00 +03:00
Alexander Alekhin
876c2c0efd Merge pull request #7678 from dec1:tag_3.0.0 2016-11-15 19:35:38 +00:00
Declan Moran
a49e50a33b fix error when building android sample:
https://github.com/opencv/opencv/issues/7590
2016-11-15 15:02:10 +01:00
Alexander Alekhin
03bab0fc0d tutorial-4-opencl: enable build with OpenCV 2015-08-13 13:32:23 +03:00
Maksim Shabunin
caffbaafbe Updated Manager for Android 2015-06-02 17:33:04 +03:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Daniil Osokin
65c5c4df70 Fixed build of camera calibration android sample 2013-08-08 09:31:25 +04:00
Andrey Kamaev
60059a7aa0 Improve handling of native_app_glue dependency in Android samples 2013-05-13 17:01:18 +04:00
Alexander Smorkalov
436d9bbcbb Base for Native Activity example added. 2013-03-18 10:37:11 +04:00
Alexander Smorkalov
b558bb4894 Tutorial-5 -> Tutorial-3 2013-02-08 12:50:58 +04:00
Alexander Smorkalov
902463b6e9 Tutorial4 sample renamed to Tutorial-2-MixedProcessing 2013-02-08 12:50:07 +04:00
Alexander Smorkalov
08cd51df1f Tutorial-3 removed as dublicate part of tutorial-4. 2013-02-08 12:47:45 +04:00
Alexander Smorkalov
b943277559 Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample. 2013-02-08 12:47:23 +04:00
Alexander Smorkalov
33502c86ac Tutorial 1 renamed 2013-02-08 12:45:48 +04:00
Andrey Kamaev
60a98aa5f7 Merge pull request #199 from apavlenko/remove_android_tutorial0
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
Andrey Pavlenko
ea83d384c1 removing Android tutorial 0 since it has become irrelevant after moving to the new application framework 2012-11-30 12:32:16 +04:00
Alexander Smorkalov
d36f8b9eb3 Code review comments applied
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov
24c920a33a Base for new sample added. 2012-11-27 18:06:43 +04:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
1046f50acb CMake for new Android example 2012-04-27 15:39:46 +00:00
Andrey Kamaev
e72a23243b Reworked build scripts for Android Java API, tests and examples 2012-03-27 16:05:52 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +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
e7642f66d9 Fixed install terget for Android examples 2011-07-25 13:17:11 +00:00
Andrey Kamaev
a17b693aa9 Fixed build of Android samples and tests 2011-07-24 20:44:20 +00:00
Andrey Kamaev
ebf9916242 Fixed android samples; fixed cmake files 2011-07-22 13:34:25 +00:00
Andrey Kamaev
7c6fc6e18a Android samples are renamed 2011-07-15 15:56:08 +00:00
Andrey Kamaev
4d8a261d99 Allowed spaces in path to OpenCV (tested only Android build) 2011-07-13 15:47:04 +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
d96f533784 Instroduced separate option for Android examples - BUILD_ANDROID_EXAMPLES 2011-07-04 08:18:02 +00:00
Andrey Kamaev
65cb53aa1e Fixed Android tests and samples build 2011-07-04 06:33:10 +00:00
Andrey Kamaev
f8e42721d3 HelloAndroid sample is moved to samples/android 2011-07-01 13:12:05 +00:00
Andrey Kamaev
01b3266612 Fixed Android target name for Android samples and tests 2011-06-30 14:56:39 +00:00
Andrey Kamaev
092699783a Added cmake script to build Android samples 2011-06-30 13:37:56 +00:00