Alexander Alekhin
87a98e4562
cmake: CMP0026 NEW
2017-08-19 15:15:05 +00:00
Maksim Shabunin
f63dde2f43
Separate OpenCV.mk files for different ABIs
2015-06-17 18:10:28 +03:00
Maksim Shabunin
7ee79b73f6
AndroidMgr: fixed package build
2015-06-03 19:01:48 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Maksim Shabunin
979721c979
Fix generating of android.mk
2015-04-06 16:12:00 +03:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
Roman Donchenko
86aabf704f
Merge pull request #2050 from asmorkalov:android_mk_fix2
2013-12-26 14:16:29 +04:00
Alexander Smorkalov
358e59e91b
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
2013-12-26 13:07:53 +04:00
Roman Donchenko
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
2013-12-25 14:04:44 +04:00
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
2013-12-23 16:40:31 +04:00
Alexander Smorkalov
58e7d9f32f
OpenCV.mk fixed for accurate CUDA support.
2013-12-23 12:58:12 +04:00
Alexander Smorkalov
4bbdfbc9e7
Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
...
Native camera libs for MIPS installation fixed.
2013-02-22 11:57:42 +04:00
Alexander Smorkalov
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
2012-11-19 12:58:17 +04:00
Andrey Pavlenko
04e9698685
possibility to maintain custom hardware-specific libs folders
2012-09-06 16:09:20 +04:00
Marina Kolpakova
b28b2428f6
changing package layout after 'make install' for Android build
2012-06-28 17:23:50 +00:00
Andrey Kamaev
9b2d7e19db
Added "fat" mode for Java wrapper
2012-03-23 17:03:05 +00:00
Andrey Kamaev
dfb161e9c9
Fixing #1580
2012-02-03 19:18: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
