generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,948 Commits 3 Branches 47 Tags
Commit Graph

476 Commits

Author SHA1 Message Date
Alexander Smorkalov
2598392295 Added explicit deb package dependency from libtbb-dev if TBB is enabled. 
(cherry picked from commit 63d6cc5ca66c0627652021650b3f5c5cc608d7f5)
 2015-05-06 16:26:50 +03:00
Vladimir Kolesnikov
bea98bd22a Not block PDB file in multithreaded build on Windows. 
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.

(cherry picked from commit 58c9135626ed85b3436c44b54030f5d9ab485e43)
 2015-04-19 14:00:24 +03:00
Roman Donchenko
bcd08b5d18 Mark the libs component required 
Everything else depends on it, after all.

(cherry picked from commit cf54e3b97ea13c0aeef5e94b5330a4b26a601d81)
 2015-04-19 13:55:35 +03:00
Roman Donchenko
19298ae3cb Add component display names 
(cherry picked from commit 6d52ea898442d2458a40f8b06b75320c9ab4a5cc)
 2015-04-19 13:55:22 +03:00
Roman Donchenko
5e06da3050 Update the CPack variables to match the changes in asmorkalov/CMake#1 
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.

(cherry picked from commit b8c60234c3fa94c31a3e2a72275fefa811c75d5c)

Conflicts:
	cmake/OpenCVPackaging.cmake
 2015-04-19 13:54:32 +03:00
Roman Donchenko
17ac18a7b9 Remove useless CPACK_*_COMPONENT_INSTALL variables 
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.

(cherry picked from commit 49fe496914cca93f19dd61aa7b1c120037d65282)
 2015-04-19 13:42:14 +03:00
Roman Donchenko
3f3ca85103 Don't use ${CMAKE_INSTALL_PREFIX} as an install destination 
Absolute destinations are not necessary, and prevent CPack from working.

(cherry picked from commit 0387f8ad56ba863a3d0d6656579e839ccaa66f10)
 2015-04-19 13:39:55 +03:00
Alexander Smorkalov
05ddc16eaa Added Debian changelog to -tests package. 
(cherry picked from commit a87ccb9ac068ef1cb9a5c99cd98615fade6676bf)
 2015-04-19 13:39:01 +03:00
Alexander Smorkalov
2ba77614aa Debian package names replaced by lower case version to satisfy lintian. 
(cherry picked from commit e6ac64008bf8186f5ea30de25573ce667ab28d29)
 2015-04-19 13:38:46 +03:00
Alexander Smorkalov
b1cdb91139 Fixed samples install permissions for Debian packaging. 
(cherry picked from commit cf852972d1c40ce16a56b8e7d5fbf060716560eb)
 2015-04-19 13:37:50 +03:00
Alexander Smorkalov
a09ad35d98 opencv_testing.sh script installation is removed as run tests script does the same thing. 
(cherry picked from commit 9206ec30a25ce8653c3acc1603501e4f545bed25)
 2015-04-19 13:37:29 +03:00
Alexander Smorkalov
1b5835cd35 Added dependency from numpy to debian package with python bindings. 
(cherry picked from commit be6b8476750e1aefe21c9775b0b732b497e2d4bd)
 2015-04-19 13:37:04 +03:00
Alexander Smorkalov
9932bbad3a Added Debian changelog installation step for Debian package generation. 
(cherry picked from commit ddc1b965b62a699239851c509e89efe23442a36e)
 2015-04-19 13:36:47 +03:00
Vladislav Vinogradov
3cf265992f fix installation layout for debian packages: 
Install symlinks to shared libraries as a part of development package,
not runtime package.

It is default behavior for debian packages.
(cherry picked from commit f55c1cc0fb390f88c91557cb443e932f459c5849)
 2015-04-19 13:23:47 +03:00
Roman Donchenko
d54d580f79 Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport 2014-09-30 15:55:26 +00:00
Alexander Smorkalov
1f4fe3bb27 GStreamer 1.0 backport from master branch. 2014-09-30 12:30:09 +04:00
Alexander Smorkalov
1c3c94fd2c Exclude OpenCL tests from default test list for Android as they are experimental. 2014-09-29 20:45:12 +04:00
Alexander Smorkalov
1cc80f10ba Added implicit dependency from python and python-py to debian packages. 2014-09-29 17:43:54 +04:00
Artur Wieczorek
7c354c14f7 CMake configuration for MSMF capture 2014-09-21 21:03:41 +02:00
Vadim Pisarevsky
a67484668e Merge pull request #2711 from GregoryMorse:patch-5 2014-09-18 11:28:58 +00:00
Vadim Pisarevsky
26fd37b27d Merge pull request #3212 from mshabunin:python_cross_build_2.4 2014-09-18 08:57:32 +00:00
Maksim Shabunin
1b4e3ec35a Changed cmake python library search startegy for crosscompiling 2014-09-12 13:44:16 +04:00
GregoryMorse
587402859e Add VS2013 support 
Fix indentation in output that made it look like changes were dependent on WinRT when they are independent libraries.

Defaults needed flipping otherwise undesired behavior.  Change is tested with combinations.

Fixed and tested

Windows Phone v8.0/v8.1 SDK for Universal Windows Apps (Windows Phone v8.1 Silverlight App support not included) and fix initial cache causing problem
 2014-09-10 17:18:41 +08:00
Igor Kuzmin
0421da78b3 XIMEA cam support: allow on OS X too 2014-09-09 19:17:13 +04:00
Alexander Smorkalov
35768ed638 Python tests added to -tests deb package. 2014-09-08 18:11:12 +04:00
Alexander Smorkalov
634ffed488 Several fixes for lintian varnings 2014-08-22 10:53:33 +04:00
Vadim Pisarevsky
fc41e8850b Merge pull request #2836 from s98felix:2.4 2014-07-25 12:59:41 +00:00
Alexander Smorkalov
daff2a0674 More accurate deb package build fix for CUDA 6.5 and newer. 
(cherry picked from commit b2790973a32eb662c165a921afe03dbfd2c65269)
(cherry picked from commit f8758da289c092fcce10baa4723d6388c4e41cb3)
 2014-07-24 15:08:29 +04:00
Alexander Smorkalov
ad5c2de97c Deb package build fix for CUDA 6.5 and newer. 
(cherry picked from commit e650d87e470b2e6a8f87ad4dd81977748a136aee)
(cherry picked from commit ca9c52ac9778d01eba933a786b4303c79d0162be)
 2014-07-24 15:08:27 +04:00
Richard Yoo
de37cfc224 Enable Intel AVX/AVX2 compilation on Windows. 2014-07-21 13:26:50 -07:00
Richard Yoo
c38023f4e7 Modifications to support dynamic vector dispatch. 2014-07-09 16:55:39 -07:00
Roman Donchenko
023102c804 cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both 
How this worked before, I do not know.
 2014-07-09 16:55:40 +04:00
Richard Yoo
11a09ef5cc Changes to support Intel AVX/AVX2 in cvResize(). 2014-06-06 15:39:09 -07:00
Vladislav Vinogradov
67b562d543 fix OpenCVConfig.cmake template - missing parentheses 2014-05-13 11:37:21 +04:00
Alexander Smorkalov
e8376c789d Fix non-Android cross compilation with OpenCVConfig.cmake 2014-05-12 15:45:02 +04:00
Alexander Smorkalov
b852108262 OpenCVConfig.cmake fix after cutting absolute CUDA libraries path. 2014-03-28 18:57:21 +04:00
Alexander Smorkalov
64d679ecb4 Added guard to prevent from gpu module redefinition in OpenCV.mk 2014-03-22 05:41:29 +04:00
Alexander Smorkalov
b0ad84cfa2 Libraries filter update after abs path cut. 2014-03-21 12:48:38 +04:00
Alexander Smorkalov
284b2fc1e7 Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path. 2014-03-19 18:47:32 +04:00
Roman Donchenko
a1e5bd71f1 Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control 2014-03-19 14:49:22 +04:00
Alexander Smorkalov
b4e4f13f9e Superres module enabled for Android. GPU samples build fixed for Android. 2014-03-18 17:07:19 +04:00
Roman Donchenko
ae036838dd Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix 2014-03-17 14:43:15 +04:00
Alexander Smorkalov
6b8de222d7 OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations. 2014-03-17 14:32:32 +04:00
Roman Donchenko
836635d2d5 Merge pull request #2434 from Nerei:viz_continue 2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25 minor cmake fix fo macos 2014-03-12 16:22:22 +04:00
Alexander Smorkalov
b3e18d23a3 Implicit CUDA and OpenCL control for module definition added. 
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
 2014-03-06 10:31:33 +04:00
Roman Donchenko
7cbc4e88de Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux 2014-02-19 12:02:41 +04:00
Roman Donchenko
5cb2d1c20d Merge pull request #2338 from asmorkalov:ocv_gcov 2014-02-18 14:25:16 +04:00
Alexander Smorkalov
de6d13088f gcov tool support added. 2014-02-18 12:59:41 +04:00
Alexander Karsakov
01a980aa9e Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries. 2014-02-17 16:56:02 +04:00