Roman Donchenko
02f8b85dd9
Add ARM64 packaging support
2015-06-08 18:03:08 +03:00
Roman Donchenko
1fbdca0c9b
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
2015-06-08 18:03:07 +03:00
Ilya Lavrenov
d89b6226a3
fixed Android mk generation for arm64-v8a
2015-05-21 15:00:46 +03:00
Alexander Smorkalov
7f63776395
Precise default CUDA version for Tegra X1 chips.
2015-05-19 13:24:17 +03:00
Alexander Smorkalov
0410fe6978
Merge pull request #3785 from jet47:tiny-gpu-module
2015-05-18 08:00:12 +00:00
Vadim Pisarevsky
1aa03cecf1
Merge pull request #3981 from patrikhuber:vs2015-support
2015-05-06 15:35:36 +00:00
Vladislav Vinogradov
cde697dd14
introduce BUILD_TINY_GPU_MODULE CMake option
...
it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)
2015-05-06 17:13:59 +03:00
Alexander Smorkalov
63d6cc5ca6
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
2015-05-06 13:10:39 +03:00
Patrik Huber
2b1103c1d3
Add support for VS2015
...
Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.
2015-05-02 13:31:43 +01:00
Abhijit Kundu
fd4df0f67d
Added suuport for finding Intel TBB for Visual Studio 2013
2015-04-25 10:23:34 +02:00
Ilya Lavrenov
847976de4e
fixed find cuda for aarch64
2015-04-23 14:49:12 +03:00
Alexander Alekhin
8c2bde2af4
Merge pull request #3923 from ilya-lavrenov:typo
2015-04-13 16:57:13 +00:00
Ilya Lavrenov
4273534c92
typo
2015-04-07 11:08:21 +03:00
Alexander Smorkalov
772fcf4088
Merge pull request #3893 from SpecLad:cuda-imported-targets
2015-04-02 13:56:31 +00:00
Vadim Pisarevsky
100c2dd91c
Merge pull request #3852 from renko:multithread_cl_not_studio_generator
2015-04-01 13:25:39 +00:00
Vladimir Kolesnikov
58c9135626
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.
2015-04-01 13:52:07 +03:00
Roman Donchenko
6e121b2e29
Use imported targets for linking to CUDA
...
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:
* It removes the need to use link_directories, which doesn't guarantee that
the libraries from the supplied directory will be used (there may be
libraries with the same names earlier in the search path).
* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
is used with target_link_libraries, where such entries are treated as linker
flags, so doing this is unportable. I remove the support for -L entries
from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
future.
2015-03-31 13:46:28 +03:00
Roman Donchenko
e6619cf580
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
...
There's no reason to do it twice.
2015-03-30 15:04:27 +03:00
Roman Donchenko
122b9f8e17
Turn ocv_convert_to_lib_name into a function
2015-03-30 14:58:37 +03:00
howtobeahacker
ebd7d08408
fix bug 4269
2015-03-30 00:01:20 +08:00
Alexander Nitsch
d430664791
Remove local variables from CMAKE namespace
2015-03-24 14:42:55 +01:00
Alexander Nitsch
13694c8ae8
Fix MinGW detection on x86
...
Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.
2015-03-07 15:49:48 +01:00
Alexander Nitsch
dde7c22fad
Fix MinGW architecture detection
...
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
2015-03-07 15:37:21 +01:00
Vadim Pisarevsky
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
2015-03-02 10:55:00 +00:00
Alexander Nitsch
a5b293b412
Fix setting of architecture for MinGW builds
...
The architecture has been correctly determined earlier in this
file. No need to do it again.
2015-02-24 23:13:27 +01:00
Alexander Smorkalov
96d7bcc2a9
Merge pull request #3677 from ilya-lavrenov:cuda_backport
2015-02-24 15:06:15 +00:00
Ilya Lavrenov
e03136e951
backport from master
2015-02-24 16:05:21 +03:00
Alexander Smorkalov
1c6e9fdfae
Merge pull request #3735 from SpecLad:align-cpack-variables
2015-02-24 11:42:40 +00:00
Alexander Nitsch
8ae6402799
Fix MinGW detection on x86
...
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.
Since we are actually interested in finding the "64" in the
triplet's operating system key, this fix makes sure to look for
"mingw64" and thus avoids the false match.
Fixes issue #3835 . Credits to Lode Leroy for the original patch.
2015-02-23 15:03:28 +01:00
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
4fcfcfd002
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
2015-02-18 12:50:10 +00: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
Vladislav Vinogradov
682fdcfc9b
make color output in run_test script optional
2015-02-09 15:23:34 +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
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
