Ilya Lavrenov
0832b47d21
fixed cross-compilation for Android with CUDA
2015-02-22 13:18:57 +03:00
Alexander Smorkalov
dcc569ee5c
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir
2015-02-21 16:49:36 +00:00
Alexander Nitsch
c2944dbc0c
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
...
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
2015-02-20 19:55:46 +01:00
Roman Donchenko
cf54e3b97e
Mark the libs component required
...
Everything else depends on it, after all.
2015-02-20 18:37:21 +03:00
Roman Donchenko
6d52ea8984
Add component display names
2015-02-20 18:22:01 +03:00
Roman Donchenko
b8c60234c3
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.
2015-02-20 18:21:47 +03:00
Roman Donchenko
c1e3ca170e
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
2015-02-20 12:38:25 +03:00
Alexander Nitsch
9665e08bac
Implement CMAKE_CURRENT_LIST_DIR for older CMake
...
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.
Fixes issue #4205 .
2015-02-20 00:55:26 +01:00
Vadim Pisarevsky
a649aea82a
Merge pull request #3699 from SpecLad:rm-component-install
2015-02-18 13:55:07 +00:00
Vadim Pisarevsky
6b371865af
Merge pull request #3716 from mshabunin:fix-vs-solution-build
2015-02-18 13:48:18 +00:00
Vadim Pisarevsky
4fcfcfd002
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
2015-02-18 12:50:10 +00:00
Maksim Shabunin
2085251df2
Exclude object libraries from visual studio solution build
2015-02-18 14:16:54 +03:00
Maksim Shabunin
c41db69f98
Fixed cmake issues
2015-02-18 12:44:48 +03:00
Maksim Shabunin
553020c448
Enabled STL usage within the library
2015-02-18 12:36:50 +03:00
Roman Donchenko
49fe496914
Remove useless CPACK_*_COMPONENT_INSTALL variables
...
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
2015-02-13 15:31:19 +03:00
Roman Donchenko
0387f8ad56
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
...
Absolute destinations are not necessary, and prevent CPack from working.
2015-02-10 19:43:29 +03:00
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
Vladislav Vinogradov
6a3f33090d
make color output in run_test script optional
2015-02-09 15:24:46 +03:00
Vladislav Vinogradov
682fdcfc9b
make color output in run_test script optional
2015-02-09 15:23:34 +03:00
Vladislav Vinogradov
098389d8eb
fix opencv_run_all_tests_unix.sh script:
...
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
2015-02-06 12:36:18 +03:00
Vladislav Vinogradov
94d14c637f
fix opencv_run_all_tests_unix.sh script:
...
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
2015-02-06 12:34:50 +03:00
Vadim Pisarevsky
98f9a013d1
Merge pull request #3674 from jet47:colorize-run-test-script-2.4
2015-02-05 07:35:01 +00:00
Mansour Moufid
c60fa84027
Add back the version variables removed in ab40630f
.
2015-02-04 10:55:38 -05:00
Alexander Smorkalov
a87ccb9ac0
Added Debian changelog to -tests package.
2015-02-04 16:52:39 +03:00
Vladislav Vinogradov
a9325102a2
colorize opencv_run_all_tests_unix.sh script output
2015-02-04 12:39:51 +03:00
Vladislav Vinogradov
2b303f38a8
colorize opencv_run_all_tests_unix.sh script output
2015-02-04 12:38:51 +03:00
Alexander Smorkalov
e6ac64008b
Debian package names replaced by lower case version to satisfy lintian.
2015-02-04 11:56:29 +03:00
Mansour Moufid
8c68f1f626
Fix indentation of 98a157f5
.
2015-02-03 23:17:43 -05:00
Mansour Moufid
98a157f589
Remove Apple-specific logic in finding the FFmpeg libraries.
...
Thanks to SpecLad.
2015-02-03 23:14:11 -05:00
Mansour Moufid
a1cc9380e5
Correct the new find_library commands.
...
Thanks to SpecLad.
2015-02-02 11:54:09 -05:00
Mansour Moufid
ab40630ff4
Use the CMake find_library command to find the FFmpeg libraries.
2015-02-01 15:51:33 -05:00
Alexander Smorkalov
cf852972d1
Fixed samples install permissions for Debian packaging.
2015-02-01 00:34:23 +03:00
Vadim Pisarevsky
1f47c22371
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh
2015-01-31 14:46:40 +00:00
Vadim Pisarevsky
602b034a03
Merge pull request #3658 from asmorkalov:numpy_dependency
2015-01-31 14:45:11 +00:00
Alexander Smorkalov
ddc1b965b6
Added Debian changelog installation step for Debian package generation.
2015-01-30 13:21:52 +03:00
Alexander Smorkalov
be6b847675
Added dependency from numpy to debian package with python bindings.
2015-01-30 12:27:33 +03:00
Alexander Smorkalov
9206ec30a2
opencv_testing.sh script installation is removed as run tests script does the same thing.
2015-01-29 19:20:18 +03:00
Vadim Pisarevsky
97aa8d3341
Merge pull request #3603 from alalek:ocl_svm
2015-01-29 05:35:46 +00:00
Vadim Pisarevsky
f3311f9e2a
Merge pull request #3638 from jet47:remove-cuda-module
2015-01-28 18:51:32 +00:00
Vadim Pisarevsky
5cbdce97aa
Merge pull request #3645 from SeninAndrew:mp-msvs-fix
2015-01-28 18:50:39 +00:00
Andrew Senin
d08589d435
Fix for Visual Studio multiprocess builds for CMake versions > 2.8
2015-01-26 18:54:27 +04:00
Vladislav Vinogradov
482feb7266
FindCUDA fix : do not unset CACHE variables on first call
...
This will allow to override CUDA CMake variables from first CMake call,
like cmake -DCUDA_TOOLKIT_ROOT_DIR=... -DCUDA_CUDA_LIBRARY=...
2015-01-26 10:24:53 +03:00
Alexander Alekhin
0a07d780e0
ocl: OpenCL SVM support
2015-01-23 20:37:45 +03:00
Vladislav Vinogradov
fa23a01775
fix FindCUDA CMake module:
...
do not unset variables if CUDA_TOOLKIT_TARGET_DIR is not defined
2015-01-23 19:17:00 +03:00
Vladislav Vinogradov
124ac15f1e
remove cuda module
2015-01-22 15:02:21 +03:00
Vadim Pisarevsky
03fc3d1ceb
Merge pull request #3591 from ilya-lavrenov:sse_avx
2015-01-21 10:46:23 +00:00
Vadim Pisarevsky
adbe84425f
Merge pull request #3622 from nagua:fix_find_gstreamer
2015-01-21 10:44:11 +00:00
Ilya Lavrenov
e9a6c5db21
sqsum
2015-01-20 21:10:06 +03:00
Vadim Pisarevsky
579ce93885
Merge pull request #3598 from caraffi:bug4108_testCasesLinkError
2015-01-20 12:59:34 +00:00
Vadim Pisarevsky
aacb9b7cf5
Merge pull request #3610 from jet47:fix-ocv_add_module-3.0
2015-01-20 12:35:36 +00:00