Roman Donchenko
4ab2771957
Only conflict with packages corresponding to modules that are built
9 years ago
Roman Donchenko
bef2b27155
Add missing packages to the Debian conflict list
...
And refactor the code to make sure that the dev and runtime package lists are
in sync.
9 years ago
a-andre
5262371660
install new headers like "opencv2/core.hpp"
9 years ago
Alexander Alekhin
42ba5c7d16
fix GCC 4.9 warnings
10 years ago
Alexander Alekhin
0906744788
fix python cross-compilation
10 years ago
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
10 years ago
Alexander Smorkalov
57ab0d4d17
Debian packages header update to fix conflict with OpenCV from deb repo.
10 years ago
Roman Donchenko
02f8b85dd9
Add ARM64 packaging support
10 years ago
Roman Donchenko
1fbdca0c9b
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
10 years ago
Ilya Lavrenov
d89b6226a3
fixed Android mk generation for arm64-v8a
10 years ago
Vladislav Vinogradov
21d8b588a2
exclude dates from report names
10 years ago
Vladislav Vinogradov
5d66b1130b
save tests console output to separate log files
10 years ago
Vladislav Vinogradov
0550b2c1fe
check that current directory has write access
10 years ago
Alexander Smorkalov
7f63776395
Precise default CUDA version for Tegra X1 chips.
10 years ago
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)
10 years ago
Alexander Smorkalov
2598392295
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
...
(cherry picked from commit 63d6cc5ca6
)
10 years ago
Alexander Smorkalov
63d6cc5ca6
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
10 years ago
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.
10 years ago
Abhijit Kundu
fd4df0f67d
Added suuport for finding Intel TBB for Visual Studio 2013
10 years ago
Ilya Lavrenov
847976de4e
fixed find cuda for aarch64
10 years ago
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 58c9135626
)
10 years ago
Roman Donchenko
bcd08b5d18
Mark the libs component required
...
Everything else depends on it, after all.
(cherry picked from commit cf54e3b97e
)
10 years ago
Roman Donchenko
19298ae3cb
Add component display names
...
(cherry picked from commit 6d52ea8984
)
10 years ago
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 b8c60234c3
)
Conflicts:
cmake/OpenCVPackaging.cmake
10 years ago
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 49fe496914
)
10 years ago
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 0387f8ad56
)
10 years ago
Alexander Smorkalov
05ddc16eaa
Added Debian changelog to -tests package.
...
(cherry picked from commit a87ccb9ac0
)
10 years ago
Alexander Smorkalov
2ba77614aa
Debian package names replaced by lower case version to satisfy lintian.
...
(cherry picked from commit e6ac64008b
)
10 years ago
Alexander Smorkalov
b1cdb91139
Fixed samples install permissions for Debian packaging.
...
(cherry picked from commit cf852972d1
)
10 years ago
Alexander Smorkalov
a09ad35d98
opencv_testing.sh script installation is removed as run tests script does the same thing.
...
(cherry picked from commit 9206ec30a2
)
10 years ago
Alexander Smorkalov
1b5835cd35
Added dependency from numpy to debian package with python bindings.
...
(cherry picked from commit be6b847675
)
10 years ago
Alexander Smorkalov
9932bbad3a
Added Debian changelog installation step for Debian package generation.
...
(cherry picked from commit ddc1b965b6
)
10 years ago
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 f55c1cc0fb
)
10 years ago
Ilya Lavrenov
4273534c92
typo
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
Roman Donchenko
122b9f8e17
Turn ocv_convert_to_lib_name into a function
10 years ago
howtobeahacker
ebd7d08408
fix bug 4269
10 years ago
Alexander Nitsch
d430664791
Remove local variables from CMAKE namespace
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
Ilya Lavrenov
e03136e951
backport from master
10 years ago
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.
10 years ago
Ilya Lavrenov
0832b47d21
fixed cross-compilation for Android with CUDA
10 years ago
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.
10 years ago
Roman Donchenko
cf54e3b97e
Mark the libs component required
...
Everything else depends on it, after all.
10 years ago
Roman Donchenko
6d52ea8984
Add component display names
10 years ago
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.
10 years ago