Maksim Shabunin
b4bcdd10a1
HAL: improvements
...
- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library
2015-12-03 14:43:37 +03:00
Ilya Lavrenov
130d4b1bdf
added suppression for python-script-but-no-python-dep
2015-11-25 23:38:44 +03:00
Vadim Pisarevsky
6e885e5775
Merge pull request #5682 from ilya-lavrenov:lintian-overrides
2015-11-23 13:38:38 +00:00
Ilya Lavrenov
969f0c4456
added lintian overrides for debian packages
2015-11-19 17:10:09 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Vadim Pisarevsky
38909d7959
Merge pull request #5597 from andy-held:cmakecudacross
2015-11-10 16:15:26 +00:00
Andreas Franek
01c5a0ed12
Simplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM targets, --unresolved-symbols=ignore-in-shared-libs is set when cross-compiling for ARM and FindCUDA.cmake was adjusted to find shared library stubs within the CUDA toolkit.
2015-11-03 12:30:34 +01:00
Vadim Pisarevsky
b3ac274617
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix
2015-11-03 10:59:45 +00:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Alexander Smorkalov
e245aed6bb
Debian packages with legacy C headers added to list of conflicts, relpaces, etc.
2015-10-23 16:09:04 +03:00
Alexander Alekhin
debe99f1a4
Merge pull request #5531 from mshabunin:fix-vs2015
2015-10-22 16:28:42 +00:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Alexander Alekhin
937a096bf1
export simple libs from OPENCV_LINKER_LIBS ( fix #5541 )
2015-10-19 13:49:41 +03:00
Aaron Simmons
55a9fdf051
brining over fix in master ( #4140 ) for libz import on 64-bit android
2015-10-13 17:42:40 -06:00
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
2015-10-13 17:34:08 +03:00
Vladislav Vinogradov
d81d51d155
assing labels to targets and sources
2015-10-13 17:33:26 +03:00
Alexander Smorkalov
9d24b3c3b0
Debian formatted copyright file added to all debian packages.
2015-10-13 09:09:07 +03:00
Anton V. Shokurov
bbe007159a
The latest version (5.1.1) of the gnu compiler returns just its major version ("5") when given the "-dumpversion" argument. Gnu compiler developers don't consider this to be an error. A workaround for this case has been made.
2015-10-08 07:22:20 -04:00
Alexander Alekhin
fe00689757
workaround for 32-bit OS on 64-bit x86 CPU
2015-10-06 20:42:21 +03:00
michaelveth
a3fda24597
Update OpenCVFindMatlab.cmake
...
Added fix to OpenCVFindMatlab.cmake to properly locate modern versions of unix- MATLAB. Tested with MATLAB R2015a and Ubuntu 14.04.
2015-10-06 04:17:40 -05:00
Alexander Alekhin
59082c8ee8
Merge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-native-package
2015-09-28 13:41:46 +00:00
Alexander Smorkalov
cb1dc7cb6e
Fixed wrong-name-for-changelog-of-native-package warning for deb packages.
2015-09-28 12:30:26 +03:00
Alexander Alekhin
60a689d27c
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
2015-09-24 14:46:23 +00:00
Alexander Alekhin
f52cac9d47
fix #5264
2015-09-24 15:56:47 +03:00
Alexander Alekhin
acec99876d
Merge pull request #5363 from avershov:opencl-vaapi-detect
2015-09-24 12:32:03 +00:00
Alexey Ershov
5feca50f58
changed device detection procedure, added resizing surface to bigger size
...
removed unused context_id2; changed blur size 7x7 to 3x3; added short comments
removed unnecessary call to convertFromVASurface()
replaced dumpSurface() with writeImage()
added infile cmdline parameter, input image loaded by imread()
2015-09-23 17:35:49 +03:00
Dikay900
32a4ec156b
changes to reflect 3.0 status
2015-09-21 13:44:39 +02:00
Roman Donchenko
2eab5eb6c0
Only conflict with packages corresponding to modules that are built
2015-09-21 13:44:38 +02:00
Roman Donchenko
7749eb5d1f
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.
2015-09-21 13:44:37 +02:00
Alexander Smorkalov
bd5a222d84
Debian packages header update to fix conflict with OpenCV from deb repo.
2015-09-21 13:44:36 +02:00
Alexander Smorkalov
c7bfdc2063
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
2015-09-21 13:44:36 +02:00
Vladislav Vinogradov
6282ff0887
exclude dates from report names
2015-09-21 13:44:34 +02:00
Vladislav Vinogradov
ea35fee5b8
save tests console output to separate log files
2015-09-21 13:44:33 +02:00
Vladislav Vinogradov
0e5fec288c
check that current directory has write access
2015-09-21 13:44:32 +02:00
Roman Donchenko
c0cc51cb4b
Add ARM64 packaging support
2015-09-21 13:44:31 +02:00
Roman Donchenko
5dd76a4791
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
2015-09-21 13:44:30 +02:00
Alexander Alekhin
af0942c78f
Merge pull request #5335 from Dikay900:ports_to_master
2015-09-18 11:06:08 +00:00
Vadim Pisarevsky
9533982729
Merge pull request #5272 from avershov:opencl-vaapi-fallback
2015-09-14 11:54:20 +00:00
Alexander Alekhin
7213e5f68a
ocl: correct disabling of OpenCL code
2015-09-13 20:28:23 +03:00
Ilya Lavrenov
5eb67cc2cb
fix for corrent modules dependencies
2015-09-13 12:44:35 +02:00
Ilya Lavrenov
1c3d83df54
fix for corrent modules dependencies
2015-09-11 11:30:10 +03:00
Alexey Ershov
22bb5d1fcc
implemented sample build in fallback mode without interop
2015-09-10 19:30:19 +03:00
Alexander Alekhin
b15a9d675e
cmake: use copy_if_different
2015-09-08 22:42:05 +03:00
Alexey Ershov
68a0347ff9
fallback path & sample timing implemented
...
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
2015-09-04 02:42:49 +03:00
Alexander Alekhin
af9c558764
Merge pull request #5246 from mshabunin:ccache-fix
2015-08-26 15:14:14 +00:00
Roman Donchenko
4ab2771957
Only conflict with packages corresponding to modules that are built
2015-08-26 13:42:21 +03:00
Alexander Alekhin
bbff288447
fix build with python3 only
2015-08-26 13:08:06 +03:00
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.
2015-08-25 18:50:06 +03:00
Maksim Shabunin
69db797ebb
Fixed ccache detection condition
2015-08-25 18:24:07 +03:00
Maksim Shabunin
84ecf4b1dd
Disabling precompiled headers when ccache is detected
2015-08-25 16:53:32 +03:00
Alexander Alekhin
784f77a4a5
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
2015-08-24 16:00:56 +00:00
Alexander Alekhin
44f8670719
Merge pull request #5171 from avershov:opencl-vaapi-interop
2015-08-21 12:47:14 +00:00
Alexey Ershov
a8656ea20f
implemented core support & sample
...
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
2015-08-21 02:44:03 +03:00
Maksim Shabunin
973abf0d62
cmake: Added missing extra modules warning
2015-08-19 18:33:59 +03:00
Ashley Stacey
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
2015-08-17 10:28:22 +10:00
Ilya Lavrenov
c19ed39a78
repaired GStreamer 0.10 version
2015-08-16 21:01:22 +03:00
Ruslan Baratov
e8a1bc2bd9
Suppress error message of execute_process
...
Command 'execute_process' from OpenCVFindMatlab module can omit error message
to the standard output. This can break build of the OpenCV package in
ExternalProject_Add (Windows/Visual Studio).
2015-08-11 20:39:24 +03:00
Alexander Alekhin
63bae5da71
vtk: disable on cross-compilation
2015-08-03 19:09:07 +03:00
Alexander Alekhin
d83d2d4c2f
viz: fix precompiled headers definitions
2015-08-03 14:39:24 +03:00
a-andre
5262371660
install new headers like "opencv2/core.hpp"
2015-08-02 13:13:58 +02:00
Alexander Alekhin
fe0a17e78f
fix build with Win7 SDK
2015-07-30 23:23:01 +03:00
Maksim Shabunin
9eda260495
Merge pull request #4211 from alalek:fix_python_2_4
2015-07-24 13:33:51 +00:00
Alexander Alekhin
42ba5c7d16
fix GCC 4.9 warnings
2015-07-22 14:17:54 +03:00
Alexander Alekhin
0906744788
fix python cross-compilation
2015-07-21 12:41:57 +03:00
Alexander Alekhin
2c2645191a
fix python cross-compilation
2015-07-17 14:43:01 +03:00
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
Alexander Alekhin
56ad207d37
update ffmpeg wrapper binaries
...
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
2015-07-03 19:13:15 +03:00
Evgeny Agafonchikov
6a6d58d389
Adding test support for WINRT
2015-06-30 15:35:20 +03:00
Vadim Pisarevsky
707d10f115
Merge pull request #4137 from asmorkalov:as/ros_conflict
2015-06-22 11:52:05 +00:00
Maksim Shabunin
83b2621de4
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
2015-06-19 18:53:45 +03:00
Alexander Alekhin
6ab9df5208
Merge pull request #4132 from mshabunin:fix-java-package
2015-06-18 16:13:23 +00:00
Maksim Shabunin
11ca4e61a7
Merge pull request #4134 from alalek:fix_get_target_property
2015-06-18 08:36:55 +00:00
Maksim Shabunin
2bc16e83d6
Merge pull request #4128 from alalek:fix_noipp_build
2015-06-18 08:32:31 +00:00
Alexander Alekhin
f11ed4b91d
fix "non target" warning for "world" build
2015-06-17 20:07:56 +03:00
Alexander Alekhin
80bd67c36b
Merge pull request #4125 from ruslo:interface.include.dirs
2015-06-17 16:04:46 +00:00
Maksim Shabunin
f63dde2f43
Separate OpenCV.mk files for different ABIs
2015-06-17 18:10:28 +03:00
Maksim Shabunin
7bfd070864
Merge pull request #4095 from alalek:hal_unresolved_symbols
2015-06-17 14:35:40 +00:00
Alexander Alekhin
1ce0ef9d41
fix build without IPP (and empty 3rdparty)
2015-06-17 17:24:35 +03:00
Ruslan Baratov
f30bf39bd4
Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property
...
With this fix there is no need to add includes by using
`include_directories(${OpenCV_INCLUDE_DIRS})`. Directory will be added by
command `target_link_libraries(... ${OpenCV_LIBS})` automatically.
2015-06-17 16:03:21 +02:00
Vadim Pisarevsky
220bb14d10
Merge pull request #4114 from alalek:ocl_generator_error_processing
2015-06-17 11:26:53 +00:00
Alexander Smorkalov
546e68dc65
Merge pull request #4034 from jet47:opencv_run_all_tests_unix
2015-06-17 08:19:47 +00:00
Vadim Pisarevsky
b7c2a46830
Merge pull request #4107 from SpecLad:libav-compat
2015-06-16 13:22:40 +00:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
Alexander Alekhin
b7cfd5a7da
ocl: added errors processing in OpenCL code generator, resolve space issue
2015-06-11 15:36:29 +03:00
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
2015-06-09 15:53:08 +03:00
Alexander Smorkalov
57ab0d4d17
Debian packages header update to fix conflict with OpenCV from deb repo.
2015-06-09 14:59:12 +03:00
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
Alexander Alekhin
8184e57dd6
fix tests build (win,shared,world)
2015-06-05 16:30:36 +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
Vadim Pisarevsky
41af58d1d5
Merge pull request #4076 from kalistratovag:parallel_pthreads
2015-06-01 16:53:50 +00:00
kalistratovag
bf5393ae58
parallel for on pthreads initial commit
...
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
2015-06-01 17:48:21 +03:00
Alexander Smorkalov
1df0f1da97
Precise default CUDA version for Tegra X1 chips.
2015-05-30 23:30:56 +02:00
Vadim Pisarevsky
f7ad192842
Merge pull request #4063 from Dikay900:2_4_to_master
2015-05-28 14:49:13 +00:00
Alexander Alekhin
75558ae75c
Merge pull request #4058 from mshabunin:latch-sample
2015-05-26 16:26:57 +00:00
Ilya Lavrenov
bb72206ec5
ability to enable OpenMP simultaneously with other parallel framework
2015-05-26 18:08:28 +02:00
Maksim Shabunin
5ad4bed70a
Added cvconfig.h copy during the build
2015-05-26 15:58:27 +03:00
Vadim Pisarevsky
8fb37606f6
Merge pull request #4032 from mshabunin:fix-pkg-config
2015-05-26 12:47:14 +00:00
Vladislav Vinogradov
653810e4df
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.
2015-05-24 14:06:32 +02:00
Alexander Smorkalov
5141141e2b
Deb package build fix for CUDA 6.5 and newer.
...
(cherry picked from commit e650d87e47
)
(cherry picked from commit ca9c52ac97
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-05-24 11:55:47 +02:00
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
Samuel Martin
671a630f47
cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation
...
Using absolute path to locate the components in the "Libs:" field of the
*.pc can badly break cross-compilation, especially when building
statically linked objects.
Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths
when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment
variables are set [1]. This feature is very helpful and common in
cross-compilation framework like Buildroot [2,3].
When there are absolute paths in the *.pc files, pkg-config won't be
able to do the path substitutions for these paths when the
aforementioned environment variables are set.
In such case, since the prefix is the target one, not the sysroot one,
these libraries' absolute paths will point to:
- in the best case: a non-existing file (i.e. these files do not exists
on the host system;
- at worst: the host system's libraries. This will make the linking
failed because these host system's libraries will most likely not be
build for the target architecture [4].
So, this patch replace the components' absolute paths by the form:
-L<libdir> -l<libname>
This way, the linker will be able to resolve each dependency path,
whatever the kind of objects/build (shared object or static build) it
is dealing with.
Note that for static link, the library order does matter [5]. The order
of the opencv components has been carefully chosen to comply with this
requirement.
Fixes #3931
This patch is a port of [6] on the master branch.
[1] http://linux.die.net/man/1/pkg-config
[2] http://buildroot.org/
[3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in
[4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log
[5] http://stackoverflow.com/questions/45135/linker-order-gcc
[6] eceada586b
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
2015-05-22 16:09:05 +03:00
Ilya Lavrenov
d89b6226a3
fixed Android mk generation for arm64-v8a
2015-05-21 15:00:46 +03:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
Vladislav Vinogradov
21d8b588a2
exclude dates from report names
2015-05-19 18:26:13 +03:00
Vladislav Vinogradov
5d66b1130b
save tests console output to separate log files
2015-05-19 18:26:13 +03:00
Vladislav Vinogradov
0550b2c1fe
check that current directory has write access
2015-05-19 18:26:04 +03:00
Alexander Smorkalov
7f63776395
Precise default CUDA version for Tegra X1 chips.
2015-05-19 13:24:17 +03:00
Maksim Shabunin
e936670571
Install cvconfig.h file
2015-05-18 19:19:48 +03:00
Alexander Smorkalov
0410fe6978
Merge pull request #3785 from jet47:tiny-gpu-module
2015-05-18 08:00:12 +00:00
Vadim Pisarevsky
35884a7e3f
Merge pull request #3982 from patrikhuber:vs2015-support-master
2015-05-15 12:32:27 +00:00
Vadim Pisarevsky
a26ab3ab16
Merge pull request #3917 from yanlend:patch-1
2015-05-14 21:16:24 +00:00
Marvin Smith
ae933db526
Fixing the gdal include error that Macports seems to only mess up.
2015-05-11 20:27:50 -07: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
40b765b7c2
Add VS2015 compatibility to CMake scripts
2015-05-02 15:24:14 +01: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
Vadim Pisarevsky
30a3ff0de6
fixed compile errors on OSX and other systems where ffmpeg is detected manually, not via pkg-config
2015-04-29 11:43:53 +03:00
Vadim Pisarevsky
e60dcc9b3b
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
2015-04-28 11:00:57 +00:00
Maksim Shabunin
bcf02ae439
Merge pull request #3678 from mshabunin:explicit-sse-disable
2015-04-28 10:41:14 +00:00
Maksim Shabunin
1138a38dbe
Use explicit no-sse flags when SSE is off
...
Also:
- Silence clang warnings about unsupported command line arguments
- Add diagnostic print to calib3d test
- Fixed perf test relative error check
- Fix iOS build problem
2015-04-27 15:36:10 +03:00
Mansour Moufid
655b28ee0c
Use the CMake find_library command to find the FFmpeg libraries.
...
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
2015-04-25 19:00:33 +02:00
Vladimir Kolesnikov
2c73e49dac
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-25 18:54:50 +02:00
Abhijit Kundu
fd4df0f67d
Added suuport for finding Intel TBB for Visual Studio 2013
2015-04-25 10:23:34 +02:00
Alexander Nitsch
d6c95621e8
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 .
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-04-24 23:10:50 +02:00
Ilya Lavrenov
614edafe73
typo
2015-04-24 22:38:51 +02:00
Ilya Lavrenov
f57063efa2
port of aarch64 cuda changes from 2.4
2015-04-23 17:57:29 +03:00
Ilya Lavrenov
847976de4e
fixed find cuda for aarch64
2015-04-23 14:49:12 +03:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Vadim Pisarevsky
926754a66e
another attempt to resolve ABI checker complains
2015-04-21 12:42:46 +03:00
Vadim Pisarevsky
fa41653420
trying to avoid ABI checker failures
2015-04-21 11:30:41 +03:00
Alexander Alekhin
8c2bde2af4
Merge pull request #3923 from ilya-lavrenov:typo
2015-04-13 16:57:13 +00:00
yanlend
443b3157e0
Fix win32 search for same bitness executable
...
find_package(PythonInterp) calls find_program(PYTHON_EXECUTABLE), i.e. without version number. For the Win32-search before to be effective, the same variable has to be used.
2015-04-10 14:57:31 +02:00
Maksim Shabunin
97c78838a4
Fixed windows build and one warning
2015-04-10 11:37:16 +03:00
Maksim Shabunin
728bd0ba84
Merge pull request #3905 from mshabunin:fix-android-mk
2015-04-09 12:08:05 +00:00
Maksim Shabunin
f803c2a7bb
Generators: updated the library gathering loop
2015-04-08 14:15:20 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Ilya Lavrenov
4273534c92
typo
2015-04-07 11:08:21 +03:00
Maksim Shabunin
979721c979
Fix generating of android.mk
2015-04-06 16:12:00 +03:00
Alexander Smorkalov
772fcf4088
Merge pull request #3893 from SpecLad:cuda-imported-targets
2015-04-02 13:56:31 +00:00
Vadim Pisarevsky
da0e2c5bf3
Merge pull request #3889 from nitsch:fix-mingw-cmake
2015-04-02 11:45:20 +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
149c1c16ba
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
...
How this worked before, I do not know.
2015-03-31 12:41:50 +03:00
Alexander Nitsch
afd9de6f1b
Fix static/shared lib detection
...
The check for BUILD_SHARED_LIBS had its logic backwards. If this
variable is not defined we must assume a build of static libs.
2015-03-31 00:05:49 +02:00
Alexander Nitsch
66e653d24d
Remove local variables from CMAKE namespace
2015-03-31 00:05:48 +02:00
Alexander Nitsch
3fff0e5b3c
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-31 00:05:48 +02:00
Alexander Nitsch
8f84a73b82
Fix MinGW architecture detection
...
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
2015-03-31 00:05:47 +02:00
Alexander Nitsch
2e86cedef2
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.
Turns out we do not even need this additional check since the
architecture has been correctly determined earlier in this file.
No need to do it again.
2015-03-31 00:02:03 +02: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
Kevin Squire
5e354fa844
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
2015-03-26 17:48:03 -07:00
Vadim Pisarevsky
174593643c
Merge pull request #3863 from MSOpenTech:fix_winrt_linker
2015-03-24 15:05:43 +00:00
Alexander Nitsch
d430664791
Remove local variables from CMAKE namespace
2015-03-24 14:42:55 +01:00
Evgeny Agafonchikov
c196df6db0
Do not link vfw32 library for WinRT
...
HAVE_VFW flag is defined by CMake try_compile check.
Check fails for WINRT as vfw.h begins with
and contains empty set of functions for Store apps.
So we can safely remove vfw32.lib for WINRT in general
(independently of availability for specific configuration)
2015-03-23 20:45:58 +03:00
Evgeny Agafonchikov
17d36b7835
Removing unused winrttest.cpp file
2015-03-23 16:56:50 +03:00
Maksim Shabunin
796bf01797
Do not compare extra modules in ABI check
2015-03-23 13:10:40 +03:00
Maksim Shabunin
9fbc92aace
Added cmake option for abi descriptor generating (GENERATE_ABI_DESCRIPTOR)
2015-03-17 16:04:04 +03:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Roman Donchenko
c71e94f054
Mark the libs component required
...
Everything else depends on it, after all.
(cherry picked from commit cf54e3b97e
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 16:24:23 +03:00
Roman Donchenko
8a732e306f
Add component display names
...
(cherry picked from commit 6d52ea8984
)
2015-03-10 16:24:23 +03:00
Roman Donchenko
87eb3f6e68
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
2015-03-10 16:24:23 +03:00
Roman Donchenko
35760bb6bf
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.
(cherry picked from commit c1e3ca170e
)
Conflicts:
CMakeLists.txt
2015-03-10 16:24:23 +03:00
Roman Donchenko
1a3273a7e3
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
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 12:53:28 +03: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
643bbb2d93
looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt
2015-03-06 16:57:38 +03:00
Vadim Pisarevsky
4aa6d10a60
added Maksim's fix as well; they both handle correctly more cases than each of them individually
2015-03-06 15:48:36 +03:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Maxim Kostin
22a30af353
Fixing buildbot job:
...
- explicitly turning OCL off since WinRT does not support it
- fixing macro definitions in core/ocl.cpp
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Vadim Pisarevsky
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
2015-03-02 10:55:00 +00:00
Vadim Pisarevsky
8e37a693e5
Merge pull request #3758 from ilya-lavrenov:aarch64
2015-03-02 10:50:31 +00:00
Vadim Pisarevsky
0a5df01626
Merge pull request #3763 from laomaiweng:patch-1
2015-03-02 10:35:40 +00:00
Quentin Minster
98d7e52b0a
Update OpenCVDetectCUDA.cmake
...
Add check for CUDA version >= 7.0 (currently in RC1), which drops support for arches 1.x.
2015-02-27 00:41:31 +01:00
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Maksim Shabunin
eb30799aed
Disable object libraries building for cmake 2.8.7 and earlier
2015-02-25 15:00:44 +03: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
58b3869730
fixed cross-compilation
2015-02-22 13:20:37 +03: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
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
Vadim Pisarevsky
c29c52a216
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
2015-01-20 12:34:50 +00:00
Nicolas Riebesel
052fe626b3
Corrected the WITH_GSTREAMER and WITH_GSTREAMER_0_10 semantic
2015-01-18 20:27:09 +01:00
Vadim Pisarevsky
396f7e1a17
Merge pull request #3604 from asmorkalov:ocv_samples_package
2015-01-16 10:23:32 +00:00
Vladislav Vinogradov
698c367d8d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
2015-01-16 11:00:56 +03:00
Vladislav Vinogradov
12a3eb776d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
2015-01-16 10:59:52 +03:00
Vladislav Vinogradov
0376a8643e
fix CMake CMP0054 warning:
...
ported from c105b72945
2015-01-15 18:40:33 +03:00
Alexander Smorkalov
6628714fc6
Fixed -samples debian package dependencies.
2015-01-15 15:36:45 +03:00
Claudio Caraffi
efc7dbaae2
Prevent linking failure, bug 4108
2015-01-14 11:55:41 +01:00
Vadim Pisarevsky
9cadc1e530
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
2015-01-13 11:25:32 +00:00
Ilya Lavrenov
f2cd65cf1e
fixes
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
25e99c453f
avx2 in arithm
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
612b8ce2cb
fixed compilation issues
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
fc0869735d
used popcnt
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
bc394e7516
detection of other CPU features
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
8d48632ebe
avx2
2015-01-12 10:59:28 +03:00
Vladislav Vinogradov
d8272b9395
remove "-target-os-variant" NVCC option for CUDA 7.0
...
it is marked as obsolete
2015-01-12 10:58:43 +03:00
Alexander Smorkalov
c778011f14
More accurate AVX and AVX2 control.
...
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
2015-01-04 23:41:14 +03:00
Alexander Smorkalov
0f263e125b
Full AARCH64 support with NEON and new CUDA toolkit.
2014-12-28 11:51:33 +03:00
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
2014-12-26 19:17:08 +03:00
Andrey Kamaev
7ec6d8a336
Fix Android build with the most resent android.toolchain.cmake
2014-12-25 12:41:17 +03:00
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
Maksim Shabunin
128e509527
Added enviroment search paths for OpenNI2 for linux and fixed specific warning
2014-12-24 15:07:05 +03:00
Vadim Pisarevsky
214f633dd4
Merge pull request #3541 from jet47:find-cuda-update
2014-12-24 11:14:54 +00:00
Vadim Pisarevsky
8d4d36f805
Merge pull request #3538 from alalek:icv_fix_package
2014-12-24 09:00:32 +00:00
Vladislav Vinogradov
e4d0652899
[FindCUDA] improvements for cross-platform build
...
* improve `CUDA_TARGET_CPU_ARCH` cache initialization,
allow to override initial value from calling script;
* add `CUDA_TARGET_OS_VARIANT` option to select OS variant;
* add `CUDA_TARGET_TRIPLET` option to select target triplet from
`${CUDA_TOOLKIT_ROOT_DIR}/targets` folder;
* remove `CUDA_TOOLKIT_TARGET_DIR` option, now it is calculated from
`CUDA_TARGET_TRIPLET`, the old approach still can be used for compatibility;
* for CUDA 6.5 and newer try to locate static libraries too, because
in 6.5 toolkit for ARM cross compilation only static libraries are included.
2014-12-23 17:48:18 +03:00
Vladislav Vinogradov
c4246bc59c
update FindCUDA CMake module to the latest version from upstream
2014-12-23 17:47:04 +03:00
Alexander Alekhin
864ec5ef45
IPPICV: don't use full paths in dependencies
2014-12-23 17:23:35 +03:00
Vadim Pisarevsky
fd6ef87c32
Merge pull request #3529 from jet47:fix-linux-install
2014-12-23 13:38:23 +00:00
Vadim Pisarevsky
5fea331d42
Merge pull request #3510 from boaz001:feature-4057
2014-12-22 10:27:33 +00:00
Vladislav Vinogradov
b15cf355af
remove opencv_testing.sh installation to /etc/profile.d/
...
opencv_run_all_tests_unix.sh already exports OPENCV_TEST_DATA_PATH
2014-12-19 11:55:38 +03:00
Boaz Stolk
bb873b1de5
add option to link to dynamic IPP libraries
2014-12-12 14:21:47 +01:00
Ilya Lavrenov
ce81433aff
ability to enable OpenMP simultaneously with other parallel framework
2014-12-10 13:34:39 +03:00
Maksim Shabunin
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
orestis
aad98e545f
Remove redundant -mfpu=neon flag.
...
This flag is already added in line 131.
2014-11-19 23:26:36 +02:00
Philipp Hasper
799646e5d0
Typos in CMake
2014-11-17 12:30:12 +01:00
Daniel Sjölie
a9a45e1546
Merge remote-tracking branch 'upstream/master' into daniel
2014-11-14 13:44:06 +01:00
Michae Gharbi
28103ad386
Fix Cuda -Wl linker options
...
This line causes the following error when building custom projects that use OpenCV beta 3:
ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'
2014-11-11 12:12:28 -05:00
Vadim Pisarevsky
b80a3a91a8
Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds
2014-11-11 13:27:41 +00:00
Roman Donchenko
13d67b6ae7
Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp
...
This is actually the same warning that the suppression at the bottom
suppresses, but that one doesn't suppress it when using a native compiler
(go figure).
I remove the forced inclusion of precompiled headers into all sources,
since otherwise this workaround doesn't work - the header with the warning
is included before I can use a pragma.
2014-11-10 18:38:54 +03:00
Vadim Pisarevsky
3da1144cef
Merge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring
2014-11-06 08:41:07 +00:00
Samuel Martin
eceada586b
cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation
...
Using absolute path to locate the components in the "Libs:" field of the
*.pc can badly break cross-compilation, especially when building
statically linked objects.
Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths
when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment
variables are set [1]. This feature is very helpful and common in
cross-compilation framework like Buildroot [2,3].
When there are absolute paths in the *.pc files, pkg-config won't be
able to do the path substitions for these paths when the afromentioned
environment variables are set.
In such case, since the prefix is the target one, not the sysroot one,
these libraries' abolute paths will point to:
- in the best case: a non-existing file (i.e. these files do not exists
on the host system;
- at worst: the host system's libraries. This will make the linking
failed because these host system's libraries will most likely not be
build for the target architecture [4].
So, this patch replace the components' absolute paths by the form:
-L<libdir> -l<libname>
This way, the linker will be able to resolve each dependency path,
whatever the kind of objects/build (shared object or static build) it
is dealing with.
Note that for static link, the library order does matter [5]. The order
of the opencv components has been carefully chosen to comply with this
requirement.
Fixes #3931
[1] http://linux.die.net/man/1/pkg-config
[2] http://buildroot.org/
[3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in
[4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log
[5] http://stackoverflow.com/questions/45135/linker-order-gcc
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Note: this patch properly applies on top of the master branch, though it
has been written on top of the 2.4 branch.
2014-11-05 11:32:11 +01:00
Daniel Sjölie
323c922322
Use OPENNI2_INCLUDE64 environment variable.
...
(Set on windows with install from http://structure.io/openni ).
2014-11-03 16:25:59 +01:00
Jose-Luis Blanco-Claraco
539acaf348
OpenCVConfig.cmake: Fix CMake CMP0012 warning
...
"TRUE"/"FALSE" should not be used as literals, as CMake has to decide
whether they are literals or variable names (sigh).
This patch should make it work with any version of CMake and with any
user-side decision on old vs. new policy behavior.
2014-10-28 09:46:18 +01:00
Maksim Shabunin
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
Vadim Pisarevsky
0cf170587f
Merge pull request #3363 from asmorkalov:qnx_support
2014-10-26 17:42:24 +00:00
Alexander Smorkalov
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
Vladislav Vinogradov
4f8a1213bd
determine test category (Public vs Extra) based on module location
2014-10-21 18:51:02 +04:00
Vladislav Vinogradov
edf54ac3a9
add CTest targets for sanity tests
2014-10-21 18:50:38 +04:00
Vladislav Vinogradov
f44c29ad7d
disable CTest target for opencv_test_viz:
...
opencv_test_viz creates windows and waits until user close them,
it is not appropriate for automatic testing
2014-10-21 18:49:53 +04:00
Vladislav Vinogradov
0c57dc2e00
rewrite add_test command for accuracy tests:
...
* use new syntax introduced in CMake 2.8.0
* set OPENCV_TEST_DATA_PATH enviroment property
2014-10-21 18:48:46 +04:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Vladislav Vinogradov
f55c1cc0fb
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.
2014-10-17 13:23:23 +04:00
Samuel Martin
38bb0db9db
cmake: fix gstreamer check conditions
...
The current situation of the Gstreamer detection does not always honor
all the configurations set by the user, among this:
- if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are off, but
Gstreamer 0.10 is installed in the system, Gstreamer 0.10 support will
be enable;
- if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are on, only checks for
Gstreamer 0.10 will be run.
This patch fixes the Gstreamer detection like this:
| -DWITH_... | Package installed || OpenCV |
| GSTREAMER | GSTREAMER_0_10 | gst-1.x | gst-0.10 || gst. support |
+===========+================+=========+==========##==============+
| OFF | OFF | - | - || none |
| OFF | ON | - | no || none |
| OFF | ON | - | yes || gst-0.10 |
| ON | OFF | no | no || none |
| ON | OFF | no | yes || gst-0.10 |
| ON | OFF | yes | - || gst-1.x |
| ON | ON | yes | - || gst-1.x |
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
2014-10-06 21:40:55 +02:00
Maksim Shabunin
b8457be394
Merge pull request #3216 from xantares:patch-1
2014-10-02 13:25:06 +00:00