Alexander Alekhin
5f80e42dac
cmake: update OpenBLAS support
...
- reorder path HINTS to avoid conflicts with other LAPACK libraries
- add extern "C" { } to avoid generation of C++ symbols
2017-10-28 10:17:37 +03:00
Alexander Alekhin
60cbc46da1
Merge pull request #9886 from mshabunin:remove-cmake-submodules
2017-10-27 11:23:19 +00:00
Alexander Alekhin
db980b0eca
cmake: fix '-fvisibility' options regression
...
CMAKE_COMPILER_ID => CMAKE_CXX_COMPILER_ID
2017-10-23 12:18:52 +03:00
Maksim Shabunin
b1fe298764
Removed cmake submodules and contrib_world references
2017-10-19 17:34:59 +03:00
Gregory Morse
d30a0c6f03
Merge pull request #9856 from GregoryMorse:patch-1
...
* Update OpenCVCompilerOptimizations.cmake
Neon not supported on MSVC ARM breaking build fix
* Update OpenCVCompilerOptimizations.cmake
Whitespace
* Update intrin.hpp
Many problems in MSVC ARM builds (at least on VS2017) being fixed in this PR now.
C:\Users\Gregory\DOCUME~1\MYLIBR~1\OPENCV~3\opencv\sources\modules\core\include\opencv2/core/hal/intrin.hpp(444): error C3861: '_tzcnt_u32': identifier not found
* Update hal_replacement.hpp
Passing variadic expansion in a macro to another macro does not work properly in MSVC and a famous known workaround is hereby applied. Discussion of it: https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
Only needed the fix for ARM builds: TEGRA_ macros are used for cv_hal_ functions in the carotene library.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): warning C4003: not enough actual parameters for macro 'TEGRA_ADD'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2143: syntax error: missing ')' before ','
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2059: syntax error: ')'
* Update hal_replacement.hpp
All hal_replacement's using carotene\hal\tegra_hal.hpp TEGRA_ functions as macros preprocessed by variadic macros should be changed, identical as was done in core.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): warning C4003: not enough actual parameters for macro 'TEGRA_CVTBGRTOBGR'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): error C2059: syntax error: '=='
* Update OpenCVCompilerOptimizations.cmake
* Update hal_replacement.hpp
* Update hal_replacement.hpp
2017-10-16 12:12:35 +03:00
Alexander Alekhin
23f26fb4a8
cmake: fix LAPACK/MKL detection
2017-10-13 15:40:37 +03:00
Maksim Shabunin
1ba29cc95d
Merge pull request #9834 from mshabunin:mediasdk-win-support
2017-10-12 12:08:54 +00:00
Maksim Shabunin
83655ba9be
MediaSDK video backend: Windows support
2017-10-11 16:33:37 +03:00
Pavel Vlasov
a972f0d4ea
Standalone IPP with IW fix;
2017-10-11 15:30:01 +03:00
Vadim Pisarevsky
638a91f92f
Merge pull request #9822 from alalek:fix_tbb_search
2017-10-10 14:22:00 +00:00
Alexander Alekhin
25161fc56f
tbb: don't search library in ENV{LD_LIBRARY_PATH}
...
ENV{LIBRARY_PATH} is enough
2017-10-10 14:18:28 +03:00
Sayed Adel
d077778074
Added support for VSX
2017-10-09 00:32:29 +00:00
Suleyman TURKMEN
a13cbced2e
Update OpenCVFindLibsGrfmt.cmake
2017-09-30 21:39:50 +03:00
bradford barr
a56d7592f0
TBB Debug Release
...
OpenCV fails to detect tbb on a debug build if the platform has only installed
debug libraries. This PR adds an additional check to the tbb detect logic for
systems that only install tbb debug and not both tbb debug and release.
2017-09-28 17:31:41 -04:00
Alexander Alekhin
587df6d942
cmake: fix typo
2017-09-26 17:19:27 +03:00
Alexander Alekhin
b143f7100a
Merge pull request #9505 from cbalint13:cuda
...
Enable CUDA_NVCC_FLAGS at arch detect step.
2017-09-25 14:05:41 +03:00
jodrescher
50b651655d
Update OpenCVDownload.cmake unpack
...
Added new "f" flag to the tar unpack, because without it doesn't complete, an compile fails
2017-09-21 14:00:43 +02:00
Alexander Alekhin
3b993431be
cmake: fix build process of OpenCL kernels
2017-09-20 18:10:31 +03:00
Alexander Alekhin
c57aef75de
Merge pull request #9647 from alalek:cmake_ipp_absolute_path
2017-09-20 12:56:33 +00:00
joncrall
a936ec325b
Added warning when MSVC_VERSION is not recognized
2017-09-19 18:00:25 -04:00
Benoit Blanchon
2d0611bc01
cmake: map RelWithDebInfo and MinSizeRel configuration to Release
2017-09-18 17:47:49 +02:00
Alexander Alekhin
6757101f55
cmake/IPP: use absolute path
2017-09-17 23:12:59 +03:00
Vladislav Sovrasov
32bf712102
cmake: disable implicit-fallthrough by default
2017-09-11 16:04:00 +03:00
Maksim Shabunin
2ac57a2b1f
Merge pull request #9457 from alalek:type_traits_issue_7599
2017-09-06 13:34:29 +00:00
Alexander Alekhin
164a41b399
fix CUDA build
...
CUDA implementation wants to convert std::vector<KeyPoint> <-> GpuMat.
There is no direct mapping from KeyPoint (mix of int/float fields)
into cv::Mat element type, so this conversion must be avoided.
Legacy mode is turned back for CUDA builds.
2017-09-04 14:41:29 +03:00
Alexander Alekhin
3df41b3263
Merge pull request #9426 from borisfom:dispatch
2017-09-03 09:24:59 +00:00
Alexander Alekhin
146be78390
cmake: cl2cpp change main OUTPUT to .hpp file
...
To reduce number of unnecessary rebuilds on updates of OpenCL kernels
2017-09-01 08:24:59 +03:00
Balint Cristian
0c4e294504
Enable CUDA_NVCC_FLAGS at arch detect step.
2017-08-31 12:57:43 +03:00
Alexander Alekhin
034aaa7a70
Merge pull request #9465 from tomoaki0705:fixJetsonTK1Build
2017-08-29 11:46:10 +00:00
Tomoaki Teshima
6531fd142c
fix build error on Jetson TK1
...
* guard correctly in header file
* guard correctly in cmake file
2017-08-29 19:05:13 +09:00
Alexander Alekhin
537ab13842
cmake: fix Pylint version detection
2017-08-28 19:03:44 +03:00
Alexander Alekhin
d195f2775a
cmake: change Pylint integration
2017-08-24 14:59:33 +03:00
tribta
b7fa6d84bc
Using Pylint Tool to Test the python tutorial codes
...
* Adding CMake script to check if pylint is installed
* Adding Pylint config file (to choose the tests that are enabled)
* Adding CMake script to samples/python/tutorial_code
Testing: bad-indentation, mixed-indentation, unnecessary-semicolon, unused-variable
2017-08-24 14:58:48 +03:00
Alexander Alekhin
9c14a2f0aa
Merge pull request #9395 from lupustr3:pvlasov/icv2017u3_update
2017-08-24 11:48:53 +00:00
Boris Fomitchev
c48807c383
Merge pull request #9418 from borisfom:cuda9
...
CUDA9 build fixed, added detection (#9418 )
* CUDA9 build fixed, added detection
* Replacing deprecated __shfl_xxx with __shfl_sync, fixing bogus CUDA9 warnings
2017-08-24 07:11:44 +00:00
Pavel Vlasov
a57718e1ac
ICV2017u3 package update;
...
- Optimizations set change. Now IPP integrations will provide code for SSE42, AVX2 and AVX512 (SKX) CPUs only. For HW below SSE42 IPP code is disabled.
- Performance regressions fixes for IPP code paths;
- cv::boxFilter integration improvement;
- cv::filter2D integration improvement;
2017-08-23 14:24:43 +03:00
Alexander Alekhin
a710317aa0
Merge pull request #9421 from csukuangfj:fix-doc
2017-08-22 20:51:49 +00:00
Boris Fomitchev
76f7fb5231
Extending CPU dispatch to the tests; fixing a typo
2017-08-21 20:58:12 -07:00
Alexander Alekhin
f694192878
cmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)
...
- '-fvisibility' flag was updated
- PVAPI library detection was changed
2017-08-21 18:06:40 +03:00
KUANG Fangjun
336996152a
Improve the documentation.
2017-08-20 17:21:39 +02:00
Alexander Alekhin
87a98e4562
cmake: CMP0026 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
6ff9fc67bb
build: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD
2017-08-14 10:59:38 +03:00
Alexander Alekhin
7a10369f4b
Merge pull request #9331 from tomoaki0705:suppressWarningVS
2017-08-10 20:22:25 +00:00
Tomoaki Teshima
14b76a5bca
suppress warnings on Visual Studio 2013 and earlier
2017-08-10 23:03:27 +09:00
Alexander Alekhin
5e32de8173
cmake: fix __STDC macros for opencv_world build
2017-08-03 18:40:05 +03:00
Alexander Alekhin
1516103a15
cmake: fix compiler flags
2017-07-26 17:21:46 +03:00
Alexander Alekhin
bf0173bf38
ts: update valgrind suppressions
2017-07-26 17:21:45 +03:00
Alexander Alekhin
402a77e7f7
Merge pull request #9237 from alalek:fix_winrt_build
2017-07-26 10:42:49 +00:00
Alexander Alekhin
2ca561f104
Merge pull request #9217 from alalek:cleanup_3rdparty
2017-07-26 10:38:28 +00:00
Alexander Alekhin
174cb06a7a
Merge pull request #9215 from alalek:cmake_min_version
2017-07-26 10:38:11 +00:00
Alexander Alekhin
8e6e05ed3f
Merge pull request #9227 from alalek:cmake_fix_ocv_add_testdata
2017-07-25 15:56:57 +00:00
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
neok-m4700
c2e281f8cf
Update OpenCVCompilerOptions.cmake
...
misplaced else
2017-07-25 10:25:20 +02:00
Alexander Alekhin
07334bc25c
cmake: fix ocv_add_testdata() hardcoded path
2017-07-25 06:56:03 +03:00
Alexander Alekhin
e45d5446f2
cleanup unused 3rdparty files
2017-07-21 15:20:13 +03:00
Alexander Alekhin
5e6e12600f
build: enable __STDC_FORMAT_MACROS macro
2017-07-21 14:29:03 +03:00
Alexander Alekhin
92f182bc3b
minimal CMake version => 2.8.12.2
2017-07-21 14:06:19 +03:00
Alexander Alekhin
22f12dc93c
cmake: fix build with CMake 3.9.0
2017-07-20 14:49:37 +03:00
Alexander Alekhin
a44c0fd51f
cmake: ocv_cmake_dump_vars() remove duplicated information
2017-07-19 12:37:36 +03:00
atinfinity
ac64713881
fixed 'OpenCVDetectCXXCompiler.cmake' to detect C++11 feature
2017-07-17 00:20:14 +09:00
Alexander Alekhin
4e39d0371d
Merge pull request #9074 from alalek:cpu_dispatch_core_hamming
...
cpu dispatch(core): hamming
2017-07-14 16:48:07 +00:00
Alexander Alekhin
0e6ebafdb3
Merge pull request #9110 from patrikhuber:fix-msvc1911-cmake
2017-07-14 14:37:01 +00:00
Patrik Huber
600b7a30e6
Added detection of MSVC1911
...
This is VS2017 Preview. It makes sure the version is detected properly and the INSTALL target then correctly installs to x64/vc15 (the same as MSVC1910).
2017-07-06 19:02:19 +01:00
Arkadiusz Raj
0ef5c8c541
Fixing Aravis support compilation issue
2017-07-05 11:30:43 +02:00
Alexander Alekhin
eed5cfba7d
cmake: fix linker flags
2017-07-04 15:04:42 +03:00
Alexander Alekhin
2863c9fe19
Merge pull request #9077 from alalek:cmake_enable_cxx11
2017-07-03 16:15:29 +00:00
Tony Lian
c8783f3e23
Merge pull request #9075 from TonyLianLong:master
...
Remove unnecessary Non-ASCII characters from source code (#9075 )
* Remove unnecessary Non-ASCII characters from source code
Remove unnecessary Non-ASCII characters and replace them with ASCII
characters
* Remove dashes in the @param statement
Remove dashes and place single space in the @param statement to keep
coding style
* misc: more fixes for non-ASCII symbols
* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
Alexander Alekhin
9611aa81b2
Merge pull request #9069 from catree:ffmpeg_warnings_errors
2017-07-03 16:09:27 +00:00
Alexander Alekhin
b10bd4b65d
Merge pull request #9068 from dkurt:mkl_with_openmp
2017-07-03 16:09:11 +00:00
Alexander Alekhin
4f01ad8517
Merge pull request #9052 from jqly:patch-1
2017-07-03 16:03:46 +00:00
Alexander Alekhin
3f02f569af
cmake: update CXX11 compiler flag
2017-07-03 16:13:12 +03:00
Alexander Alekhin
4f558e8b89
cmake: added "SSE4_2" into default CPU dispatch
2017-07-02 22:45:09 +00:00
catree
921f06eb6f
Fix ffmpeg detection with -D OPENCV_WARNINGS_ARE_ERRORS=ON option.
2017-07-02 01:59:41 +02:00
dkurt
425e92e5ca
Fix MKL linkage with enabled OpenMP
2017-07-01 20:02:13 +03:00
Maksim Shabunin
6320ede98e
Removed extra dependencies from videoio library
2017-06-30 18:54:42 +03:00
jqly
444593014f
a fix for open issue 4772
2017-06-30 20:22:16 +08:00
Alexander Alekhin
8bd2e9816a
cmake: don't add vs_version.rc for static modules (ts)
2017-06-30 13:43:31 +03:00
Alexander Alekhin
82ec76c123
Merge pull request #8990 from mshabunin:fix-static-2
2017-06-27 14:53:26 +00:00
Alexander Alekhin
f8a75c4361
dispatch: added CV_TRY_${OPT} macro, fix dnn build
...
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
2017-06-27 17:05:15 +03:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Vadim Pisarevsky
ef692350e0
Merge pull request #8966 from alalek:protobuf_sources
2017-06-26 10:27:40 +00:00
Alexander Alekhin
6b7a1d4dde
build: disable AVX512
...
Currently it is not supported.
All builds are broken with enabled AVX512 option.
2017-06-26 00:31:24 +03:00
Vadim Pisarevsky
fa7e7e0ff9
Merge pull request #8900 from alalek:update_android_build
2017-06-23 10:58:53 +00:00
Alexander Alekhin
d649d1388e
cmake: fix typo
2017-06-22 19:21:59 +03:00
Alexander Alekhin
1c4c58d1b5
3rdparty: update CMake scripts for protobuf
2017-06-22 17:44:53 +03:00
Maksim Shabunin
d27009c775
Merge pull request #8856 from mshabunin:media-tests-upgrade
2017-06-22 11:45:52 +00:00
Alexander Alekhin
d29c299cdb
cmake: additional messages on download errors
2017-06-21 19:04:27 +03:00
Dmitry Kurtaev
16368a275b
cmake: add Halide support ( #8794 )
2017-06-21 14:33:47 +03:00
Alexander Alekhin
3e3e2dd512
android: make optional "cpufeatures", build fixes for NDK r15
2017-06-21 13:34:19 +03:00
Vadim Pisarevsky
2c30f358dc
Merge pull request #8947 from alalek:vs_version
2017-06-21 09:33:52 +00:00
Alexander Alekhin
9496fe40ec
cmake: guard scanning of default MKL system-wide paths
...
- WITH_MKL option is enabled
- user doesn't specify MKLROOT/MKL_ROOT_DIR variables
2017-06-21 02:44:48 +00:00
Maksim Shabunin
87b569d812
Rewritten some tests in videoio and imgcodecs modules
...
general:
- all iterative tests have been replaced with parameterized tests
- old-style try..catch tests have been modified to use EXPECT_/ASSERT_ gtest macros
- added temporary files cleanup
- modified MatComparator error message formatting
imgcodecs:
- test_grfmt.cpp split to test_jpg.cpp, test_png.cpp, test_tiff.cpp, etc.
videoio:
- added public HAVE_VIDEO_INPUT, HAVE_VIDEO_OUTPUT definitions to cvconfig.h
- built-in MotionJPEG codec could not be tested on some platforms (read_write test was disabled if ffmpeg is off, encoding/decoding was handled by ffmpeg otherwise).
- image-related tests moved to imgcodecs (Videoio_Image)
- several property get/set tests have been combined into one
- added MotionJPEG test video to opencv_extra
2017-06-20 18:20:41 +03:00
Alexander Alekhin
db35e13b46
build: added VERSIONINFO resource
2017-06-20 15:45:21 +03:00
Maksim Shabunin
c06f3d63e8
Initial version of MediaSDK integration:
...
- cmake dependencies search (WITH_MFX option)
- raw H264, H265, MPEG2 encoding and decoding
- tests for supported formats
2017-06-20 12:15:10 +03:00
Alexander Alekhin
c3bea59a76
cmake: set minimal CPU instruction to SSE3 (x64)
2017-06-11 03:51:53 +00:00
Alexander Alekhin
1961bb1857
cmake: add ENABLE_BUILD_HARDENING option
2017-06-08 00:39:29 +00:00
Alexander Alekhin
0e1d65d3b1
build: fix PCH stub files generation optimization
2017-06-06 21:09:22 +03:00
Vadim Pisarevsky
925594d1e3
Merge pull request #7894 from alalek:ocl_program
2017-05-03 13:48:58 +00:00
Maksim Shabunin
ea49d7b7c5
Merge pull request #8653 from alalek:android_fixes
2017-05-03 12:20:19 +00:00
Alexander Alekhin
cdc7f10767
cmake: dispatcher: add handling of include dirs
...
from linked targets of base modules
2017-04-27 18:11:32 +03:00
Alexander Alekhin
4c2858fd61
cmake: fix POPCNT & SSE4.2 detection code
2017-04-26 18:59:43 +03:00
Alexander Alekhin
133b91a026
android: build fixes
...
- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+
2017-04-26 14:24:51 +03:00
Alexander Alekhin
f3eff00bf7
cmake: update handling of IPPICV/IPPIW
2017-04-26 00:15:54 +03:00
Alexander Alekhin
f1c8094f5f
Merge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update
2017-04-21 10:55:29 +00:00
Pavel Vlasov
35c7216846
IPP for OpenCV 2017u2 initial enabling patch;
2017-04-20 20:26:30 +03:00
Tomoaki Teshima
ebf13b39e5
fix build error on ODROID-X2
2017-04-18 19:31:57 +09:00
Alexander Alekhin
c90dee668f
cmake: fix optimization filter
...
Check file name only:
Excluding from source files list (optimization is disabled):
C:/Code/SrcExt/OpenCV/Buildv3.2_x64/modules/core/opencl_kernels_core.cpp
2017-04-12 18:27:20 +03:00
Alexander Alekhin
c1ade083d9
ffmpeg: add __STDC_CONSTANT_MACROS to check code
2017-04-11 12:35:48 +03:00
Tomoaki Teshima
9cd42650dc
build with cc 6.2 on Jetson TX2
2017-04-10 22:19:17 +09:00
Alexander Alekhin
739f87da6d
Merge pull request #8518 from alalek:fix_fp16
2017-04-04 20:06:59 +00:00
Alexander Alekhin
e5d9b608c4
cmake: fix fp16 support
2017-04-04 20:34:58 +03:00
Alexander Alekhin
1f86d8564f
cmake: fix GCC precompiled headers warnings
2017-04-04 19:48:16 +03:00
Alexander Alekhin
297ba85323
Merge pull request #8441 from alalek:dispatch_mathfuncs_core
2017-04-03 14:03:49 +00:00
Alexander Alekhin
8bee226d79
Merge pull request #8495 from sergiud:standalone-dynamic-ipp-detection
2017-04-02 10:17:06 +00:00
Sergiu Deitsch
98b8c32f30
cmake: fixed standalone dynamic IPP detection under win32
2017-03-31 15:44:38 +02:00
Alexander Alekhin
a7de4aca6a
cmake: update ocv_download
...
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
2017-03-30 19:36:33 +00:00
Alexander Alekhin
7cc97fd96c
Merge pull request #8421 from mshabunin:download-cache
2017-03-28 11:13:14 +00:00
Alexander Alekhin
005c4777c7
cmake: fix MSVC static builds
2017-03-25 01:28:43 +03:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Alexander Alekhin
69df0eee77
cmake: fix try_compile() with --coverage flags
2017-03-23 18:15:24 +03:00
Alexander Alekhin
17e5e4cd5a
core: CPU target dispatcher update
...
- use suffixes like '.avx.cpp'
- added CMake-generated files for '.simd.hpp' optimization approach
- wrap HAL intrinsic headers into separate namespaces for different build flags
- automatic vzeroupper insertion (via CV_INSTRUMENT_REGION macro)
2017-03-23 16:12:11 +03:00
Egor Pugin
a321cce5e4
Fix build under directories with '.cpp' string.
2017-03-23 14:42:23 +03:00
Alexander Alekhin
bcac7bd6d2
Merge pull request #8423 from terfendail:vt_ivx_enumupdate
2017-03-22 15:23:34 +00:00
Vitaly Tuzov
5ebf066dd5
Updated OpenVX detector and wrappers to handle Reference attribute names change
2017-03-22 16:50:38 +03:00
Vadim Pisarevsky
a57d144076
Merge pull request #7462 from alalek:cpu_multi_target
2017-03-21 19:51:32 +00:00
Christof Kaufmann
583e3a6875
cmake: Avoid adding default path as system directory for GCC 6.x
...
This is a completion for PR #7390 and fixes #6517 and #815 .
2017-03-09 16:23:53 +01:00
Sergey
f743c82bdd
Updated OpenCVFindMKL.cmake
...
Current version of search for MLKROOT environment variable is wrong and should be corrected to (DEFINED ENV{MKLROOT})
2017-03-06 15:28:05 +03:00
Alexander Alekhin
05248a3dea
cmake: fix order of MKL libraries, don't pass additional libraries as modules
2017-02-15 17:13:13 +03:00
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
Alexander Alekhin
a2fed4c790
Merge pull request #8084 from mshabunin:libstdcplusplus-debug
2017-02-03 08:47:37 +00:00
Pavel Vlasov
9228a8bee6
Fixes IPP build on linux;
2017-01-31 16:39:09 +03:00
Maksim Shabunin
50d350bcd1
Enable GNU STL debug mode for debug builds
2017-01-31 12:36:26 +03:00
Alexander Alekhin
68e50661a2
cmake: fix CUDA flags generation
...
VTK uses parentheses in defines, so generated code is wrong:
set(nvcc_flags -m64;-D__OPENCV_BUILD=1;-DvtkRenderingContext2D_AUTOINIT=1(vtkRenderingContextOpenGL);...)
2017-01-23 18:45:53 +03:00
Alexander Alekhin
f1adc32765
cmake: fix support of duplicated file names in static libraries
2017-01-23 18:45:53 +03:00
Alexander Alekhin
a5d16f09e6
cmake world: allow to build python bindings
2017-01-23 18:45:53 +03:00
Alexander Alekhin
36b34465a4
cmake: include contrib modules into opencv_world
2017-01-23 18:45:53 +03:00
Alexander Alekhin
dc1502ad71
Merge pull request #8001 from alalek:c_defines
2017-01-20 17:52:24 +00:00
Dal Rupnik
e71ff78f7f
Merge pull request #8009 from Legoless:master
...
CMake: Building Dynamic Framework on iOS (#8009 )
* Updated python script with dynamic parameter
Updated python script to build static library by default
Updated python script to include bitcode flag
Added bitcode flag to c flags
Fixed directories and targets with static
Bitcode parameter fixed
Fixed script for static library
Fixed parameters in build function
Updated cmake common toolchain
Added changes to OpenCV Utils
Updates to cmake
Added cache internal
Updates to common toolchain
Fixed path in framework destination and added UIKit dependency
Dynamic plist for framework
Lib version removed hardcoded value
Removed trailing whitespace in toolchain
* Removed trailing whitespace
* Fixed typo in comment
* Renamed bitcode variable to bitcodedisabled
* Fixed target device family
2017-01-20 19:16:01 +03:00
Alexander Alekhin
f9828cd0c9
cmake: fix MKL detection in case of unsupported versions
...
CMake should not fail.
2017-01-19 13:33:39 +03:00
Alexander Alekhin
2b44c0b649
cmake: fix lapack
...
- added compile check with multiple tries for different configurations
- restored find_package(LAPACK)
- avoided modification of OPENCV_LINKER_LIBS
2017-01-17 15:56:42 +03:00
Alexander Alekhin
b7630a088b
cmake: add global defines to enable useful macros
2017-01-13 14:30:19 +03:00
Vladislav Sovrasov
7e99911c82
Fix MKL x86 detection on Windows
2017-01-11 17:18:21 +03:00
Vadim Pisarevsky
0bd68671bd
restored OpenBLAS detection; fixed MKL's lapack header ( #7921 )
2016-12-23 15:40:51 +03:00
Vadim Pisarevsky
ad74fdd7cc
moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository ( #7918 )
...
* moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository.
* trying to fix the bug with undefined symbols sgesdd_ and dgesdd_
* removed extra whitespaces; disabled LAPACK on IOS
2016-12-22 22:57:44 +03:00
Alexander Alekhin
ccd32f6608
Merge pull request #7897 from alalek:fix_ffmpeg_check
...
cmake: fix ffmpeg check code (port into master #7893 )
2016-12-19 16:18:49 +02:00
Alexander Alekhin
7a95e654eb
ocl: update compiled programs
...
- minimize library initialization time (lazy calculations of program hash)
- LRU cache of in-memory compiled programs
2016-12-19 17:17:20 +03:00
Alexander Alekhin
3e1695d6e3
cmake: fix ffmpeg check code
2016-12-19 17:05:30 +03:00
Alexander Alekhin
2638abe12b
Merge pull request #7694 from sergiud:cmake-config-optional-components
2016-12-19 13:53:36 +00:00
Alexander Alekhin
35308bc45f
cmake: fix CMake error
...
"install DIRECTORY does not allow "COMPONENT" after PATTERN or REGEX."
2016-12-19 14:58:56 +03:00
Sergiu Deitsch
d71ec0cd1d
cmake: support OPTIONAL_COMPONENTS in OpenCVConfig.cmake
...
find_package allows to specify optional components. This way, the
command will not fail if any of the components marked as optional was
not found. This is useful in cases where components such as xfeatures2d,
viz etc. are not available either because they were not compiled by the
user or package maintainers decided to not provide the packages at all.
The user can check the availability of the optional component using the
OpenCV_<component>_FOUND variable.
2016-12-19 00:15:51 +03:00
Alexander Alekhin
0e4dde1781
Merge pull request #7872 from alalek:merge-2.4
2016-12-16 16:03:14 +02:00
Alexander Alekhin
ceb5210bfb
build: eliminate ICC PCH warning
2016-12-15 15:58:16 +03:00
Alexander Alekhin
dbbbad40fb
build: eliminate ICC warnings
2016-12-15 15:57:40 +03:00
Alexander Alekhin
540ece74a5
cmake: support ICC warnings
2016-12-15 15:57:27 +03:00
Alexander Alekhin
3fc06f14d4
cmake: use -fp-model precise with ICC
2016-12-15 15:56:31 +03:00
Patrik Huber
bd0a8c7e3f
Added VS2017 support (MSVC 1910)
2016-12-06 00:04:24 +00:00
Alexander Alekhin
0724d13bcd
build: cuda warnings
2016-12-04 03:10:05 +03:00
Alexander Alekhin
3ae1990727
Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup
2016-12-01 20:24:05 +00:00
Vadim Pisarevsky
5e75503fc2
Merge pull request #7750 from alalek:ts_find_or_skip
2016-12-01 18:10:18 +00:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Vadim Pisarevsky
817a17b218
Merge pull request #7767 from mshabunin:icl-support
2016-12-01 16:30:42 +00:00
Maksim Shabunin
19959cbfc9
Fixed Intel C++ 17 build in VS2015
2016-12-01 18:02:50 +03:00
mshabunin
695c518384
Updated TBB search script and code checks
2016-12-01 16:58:38 +03:00
Alexander Alekhin
71b2409df0
ts: added findDataFile() utility function and SkipTestException
2016-11-29 23:17:39 +03:00
Alexander Alekhin
14d2046f80
cmake: ccache
2016-11-18 15:09:44 +03:00
Alexander Alekhin
04ddbf565e
cmake: eliminate configuration warnings
2016-11-10 18:36:07 +03:00
Alexander Alekhin
ecac70f120
Merge pull request #7531 from dtmoodie:cmake_updates
2016-10-22 16:13:11 +00:00
Arek
e77bc24b96
Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status
...
Aravis several updates
* Fix adressing camera with id=0
* Aravis buffer property control & status added
* Modify of autoexposure algorith, ream frame ID from aravis + new properites
* Change of macro name
* VideoCapture now returns no frame on camera disconnecion
* Allow aravis-0.4 usage, proper camera object release.
2016-10-22 19:07:55 +03:00
Dan
8842b9b2b2
Newer versions of gstreamer use a slightly different include path on windows.
...
Newer versions of VTK have moved some of the reader objects into vtkIOGeometry.
2016-10-20 11:02:18 -04:00
Alexander Alekhin
e2e1485373
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities
2016-10-15 09:19:22 +00:00
Alexander Alekhin
d1e8651aae
ios: disable IPPICV on i386-iPhoneSimulator
2016-10-15 03:29:21 +03:00
StevenPuttemans
fa32abe5f3
add 5.2 and 6.1 compute capability support
2016-10-14 10:14:12 +02:00
Alexander Alekhin
4c8d25878b
cmake: update configuration for iOS
2016-10-12 23:43:29 +03:00
Vadim Pisarevsky
4acda3f609
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
2016-10-12 19:38:25 +00:00
Alexander Alekhin
6cfe4a85f7
cmake: fix ocv_check_compiler_flag
2016-10-08 02:19:43 +03:00
ArkadiuszRaj
70c12e5407
Basic support for GigE cameras via Aravis SDK
2016-10-07 21:55:49 +02:00
Noel Eck
d6bcab3c7b
doc: Small change to documentation in DectectPython.cmake
...
Fixed small typo for python 3 default version.
Signed-off-by: Noel Eck <noel.eck@intel.com>
2016-10-05 16:52:28 -07:00
Alexander Alekhin
b640e72877
cmake: update PCH
...
1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS
2016-10-04 19:41:28 +03:00
mshabunin
81938af5d0
Added support for OpenVX 1.0, updated cmake part, minor fixes
2016-10-04 15:31:54 +03:00
Alexander Alekhin
21d9412c93
cmake: fix for GCC 6.x
2016-10-03 19:39:04 +03:00
Alexander Alekhin
a3f74aaaaf
cmake: repair GCC PCH
2016-09-30 23:37:43 +03:00
Alexander Alekhin
d34f2cfefe
Merge pull request #7317 from tomoaki0705:fixIfdefFp16
2016-09-26 10:59:32 +00:00
Tomoaki Teshima
c7cb116dc0
check FP16 build condition correctly
...
* use __GNUC_MINOR__ in correct place to check the version of GCC
* check processor support of FP16 at run time
* check compiler support of FP16 and pass correct compiler option
* rely on ENABLE_AVX on gcc since AVX is generated when mf16c is passed
* guard correctly using ifdef in case of various configuration
* use v_float16x4 correctly by including the right header file
2016-09-23 11:04:22 +09:00
Jeroen Kromwijk
401537ebab
Detect the correct Python major version
2016-09-18 12:02:33 +02:00
Vadim Pisarevsky
dc3d0cbc22
Merge pull request #7266 from alalek:pr7159
2016-09-16 21:18:26 +00:00
Vadim Pisarevsky
6a1e549ffe
Merge pull request #7217 from thiell:master
2016-09-14 12:08:45 +00:00
Alexander Alekhin
f85e33f4af
videoio: refactor AVFoundation code integration
2016-09-09 17:42:41 +03:00
Alexander Alekhin
d855608e6e
instrumentation: fix build on Linux
...
- enable C++11
- fix macro
2016-09-08 16:13:46 +03:00
Alexander Alekhin
10d18a315c
instrumentation: minor refactoring, wrap OpenCL
...
- calculate ticksTotal instead of ticksMean
- local / global width is based on ticksTotal value
- added instrumentation for OpenCL program compilation
- added instrumentation for OpenCL kernel execution
2016-09-08 16:13:44 +03:00
Alexander Alekhin
d102ea96c0
Merge pull request #7210 from mshabunin:fix-warnings
2016-09-02 12:50:45 +00:00
Stephane Thiell
3335963987
cmake: add support for Nvidia GPU Tesla K80
2016-09-01 12:07:32 -07:00
Maksim Shabunin
dc704d77ac
Fixed several GCC 5.x warnings
2016-09-01 15:44:01 +03:00
Alexander Alekhin
a986db56c6
cmake: update matlab path
2016-09-01 15:17:32 +03:00
Alexander Alekhin
da0e07bc1b
Merge pull request #7177 from alalek:msvs_layout
2016-08-29 09:36:49 +00:00
Alexander Alekhin
db6d94a7b0
cmake: minimize MSVS projects layout
...
Also put "object" targets to off by default (they doesn't work well)
2016-08-26 13:40:16 +03:00
Maksim Shabunin
ae3dfa80db
OpenVX HAL
2016-08-25 16:08:45 +03:00
yoffy
767780a4b2
add VideoCapture / VideoWriter AVFoundation implementation for Mac
2016-08-23 10:51:58 -07:00
Alexander Alekhin
93e5947f55
Merge pull request #7101 from lupustr3:pvlasov/instrumentation
2016-08-18 14:56:41 +00:00
Vadim Pisarevsky
9e6575428d
Merge pull request #7111 from sovrasov:mkl_lapack
2016-08-18 13:05:26 +00:00
Alexander Alekhin
fde4e8fed9
cmake: add /usr/local/lib on Apple platform
2016-08-17 18:04:06 +03:00
Pavel Vlasov
a462d76a95
Implementations instrumentation framework for OpenCV performance system;
2016-08-17 16:26:03 +03:00
Sovrasov
a3b4d4608d
Static Lapack linkage
2016-08-17 11:33:09 +03:00
Vladislav Sovrasov
a113d9bcc1
Add MKL support
2016-08-10 11:20:23 +03:00
Alexander Alekhin
18e7afdfd9
cmake: add OPENCV_ENABLE_NONFREE option and macro
2016-08-04 19:23:49 +03:00
Alexander Alekhin
2ec63e4dd1
fix android pack build
2016-07-20 16:49:57 +03:00
Alexander Alekhin
22919c39ad
Merge pull request #6950 from tomoaki0705:fixMf16cBuildError
2016-07-19 11:53:28 +00:00
Tomoaki Teshima
d5179b8218
let the test Video_AccSquared.accuracy pass on linux x64 debug
2016-07-19 18:29:37 +09:00
Vadim Pisarevsky
b6f21a6cac
Merge pull request #6813 from mshabunin:gdcm-cmake-search
2016-07-18 16:00:43 +00:00
Vadim Pisarevsky
48b747903b
Merge pull request #6830 from tomoaki0705:featureSupportFp16
2016-07-18 15:56:00 +00:00
Maksim Shabunin
63d8290491
Merge pull request #6779 from alalek:python_dynamic_lookup
2016-07-15 12:28:30 +00:00
Vladislav Vinogradov
d76f258aeb
update CUDA architecture flags initialization
...
* remove obsolete paths
* add Pascal arch support
2016-07-13 13:03:16 +03:00
Vladislav Vinogradov
112903c2bd
increase minimal supported CUDA toolkit to 6.5
2016-07-13 13:02:13 +03:00
Alexander Alekhin
7176c1327e
Merge pull request #6850 from alalek:bigdata_test
2016-07-11 14:01:06 +00:00
Alexander Alekhin
5f269d08b4
bigdata: add test, resolve split/merge issue
2016-07-08 18:05:53 +03:00
look4pritam
6f22f49c02
Grassroots DiCoM i.e. GDCM based DICOM image reader is added.
2016-07-08 16:08:55 +03:00
Alexander Alekhin
c0fe374490
cmake: python, allow dynamic symbols lookup from libpython.so
2016-07-07 14:23:35 +03:00
Alexander Alekhin
ee4f409584
cmake: lapack optimized code requires cblas.h
2016-06-30 20:25:08 +03:00
Alexander Alekhin
c5a8619493
cmake: fix install path
...
CMake doesn't work with empty paths ("") or paths which contains "./"
2016-06-28 13:29:00 +03:00
Alexander Alekhin
0ebe387cb2
Merge pull request #6713 from alalek:cmake_install_fix
2016-06-22 20:35:15 +00:00
Alexander Alekhin
f57e3ce5f3
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
...
CPack can't work with absolute paths.
2016-06-22 16:38:54 +03:00
Alexander Alekhin
09ce987552
cmake: fix export issue
...
opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)
2016-06-22 15:34:46 +03:00
Alexander Alekhin
c6c651212c
cmake: refactoring of OpenCVConfig
...
- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK
2016-06-20 15:15:21 +03:00
Vadim Pisarevsky
547a2d29c3
Merge pull request #6535 from sovrasov:lapack-hal
2016-06-16 20:09:47 +00:00
Alexander Alekhin
7fadf570b8
Merge pull request #6690 from alalek:cmake_fix_android_samples
2016-06-16 15:56:19 +00:00
Alexander Alekhin
777e1d38ba
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
2016-06-16 14:32:07 +03:00
Tomoaki Teshima
addb15383a
fix run time error
2016-06-16 18:14:53 +09:00
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
2016-06-15 17:34:30 +03:00
Tomoaki Teshima
15f8bc6f37
fix cmake
...
* enable fp16 feature correctly with gcc on x86/x86_64
2016-06-06 21:48:18 +09:00
Vladislav Sovrasov
a2d0cc878c
Implement internal HAL for GEMM and matrix decompositions
2016-06-03 10:38:30 +03:00
Guy Sheffer
0a48b9ae77
Fix #6500 cmake bug that adds D_FORCE_INLINES to NVCC
2016-05-26 13:45:50 +03:00
Tomoaki Teshima
b2ad7cd9c0
add feature to convert FP32(float) to FP16(half)
...
* check compiler support
* check HW support before executing
* add test doing round trip conversion from / to FP32
* treat array correctly if size is not multiple of 4
* add declaration to prevent warning
* make it possible to enable fp16 on 32bit ARM
* let the conversion possible on non-supported HW, too.
* add test using both HW and SW implementation
2016-05-21 21:31:33 +09:00
Maksim Shabunin
a0fdc91a14
Disabled PCH support for gcc >= 6.0.0
...
Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.
2016-05-13 13:32:09 +03:00
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57a
add fixed video
db0ae2c
Restore 2.4 source branch for bug fix 6317.
97ac59c
Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d
Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7
fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Alexander Alekhin
9393a0c5bb
cmake: don't use -isystem for opencv_contrib paths
2016-04-18 12:48:14 +03:00
Alexander Alekhin
7783836fff
Merge pull request #6265 from huang-qiao:master
2016-04-06 04:51:59 +00:00
qiao
a7fe73f284
fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11
...
syntax of cmake "get_filename_component" changed after version 2.8.11
for cmake version < 2.8.11
get_filename_component(<VAR> <FileName> PATH [CACHE])
for cmake version >= 2.8.11
get_filename_component(<VAR> <FileName> DIRECTORY [CACHE])
Update OpenCVConfig.cmake
Update OpenCVConfig.cmake.in
2016-04-06 11:33:53 +08:00
Xiaolei Yu
40eb613bbf
Make install paths relative to CMAKE_INSTALL_PREFIX
2016-03-19 16:41:51 +08:00
Alexander Smorkalov
b8ce65bec8
Merge pull request #6279 from terfendail:vt/pythontest_data
2016-03-17 12:27:12 +00:00
Vitaly Tuzov
96903dc4ad
Test data necessary for python samples added to test package.
...
Test launch script updated to run new tests as well.
2016-03-17 11:38:40 +03:00
Maksim Shabunin
d2e451e877
Ported VTK cmake detection from master branch
2016-03-11 16:25:47 +03:00
Alexander Smorkalov
9c4204b89e
Added check if debian package version matches version from version.hpp
2016-03-11 11:59:15 +03:00
Alexander Alekhin
8c591ebd77
Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052
2016-02-16 07:10:02 +00:00
Alexander Alekhin
b2ca10a81f
cmake: fix find_library() for bzip2
2016-02-11 12:57:10 +03:00
Alexander Alekhin
87bbaa2c27
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
2016-02-11 12:44:45 +03:00
Alexander Alekhin
c10c8db97d
cmake: skip checks for host paths on cross-compilation (5897)
2016-02-06 15:19:28 +03:00
atinfinity
cf43790a27
added cmakedefine to cmake/templates/cvconfig.h.in
2016-02-01 21:15:28 +09:00
atinfinity
db6e095fcc
added cmakedefine to cmake/templates/cvconfig.h.in
2016-02-01 20:59:11 +09:00
atinfinity
69eaa89e22
fixed to use NVCUVID in 'cudacodec' module.
2016-01-31 01:56:45 +09:00
atinfinity
ed8368fed7
fixed to use NVCUVID in 'cudacodec' module.
2016-01-31 01:28:15 +09:00
Matt Leotta
912592de4c
Remove "INSTALL_NAME_DIR lib" target property
...
The INSTALL_NAME_DIR property of a target specifies how a dynamic library should
be found on OS X. If INSTALL_NAME_DIR is not specified the loader will search
relative to the standard search paths. If specified it should either be
an absolute path or relative path prefixed with either @executable_path,
@load_path, or @rpath. Specifying "lib" does not make sense here and
causes linking error as documented here:
http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library-on-mac-osx/
and here
http://stackoverflow.com/questions/26978806/dyld-library-not-loaded-lib-libopencv-core-3-0-dylib-reason-image-not-found
This patch removes INSTALL_NAME_DIR everywhere it is set to "lib".
An alternate solution would be to set an absolute path like
"${CMAKE_INSTALL_PREFIX}/lib" or relative path like
"@executable_path/../lib". However, if there is not specific need for
specifying a path, it is probably best left unset.
2016-01-21 16:07:56 -05:00
Alexander Smorkalov
5a5378b3bf
Added lintian overrides for package signature entry.
2016-01-21 17:04:28 +03:00
Alexander Alekhin
9bee835dac
cmake: fix python detection
2016-01-20 19:01:00 +03:00
Maksim Shabunin
68eab8ea00
Merge pull request #5884 from alalek:cmake_vars
2016-01-17 09:43:17 +00:00
Alexander Alekhin
8f37a3a37c
cmake: make ocv_cmake_dump_vars() case insensitive
2016-01-15 14:38:25 +03:00
Alexander Alekhin
9cd6731894
cmake: add DEBUG_PRE/DEBUG_POST commands handling
...
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
2016-01-15 14:36:03 +03:00
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
2016-01-15 13:05:16 +03:00
Alexander Alekhin
243c513eea
Merge pull request #5969 from alalek:fix_cuda_world
2016-01-15 06:57:19 +00:00
Alexander Alekhin
bc46682b28
Merge pull request #5893 from dtmoodie:vtk
2016-01-14 14:44:07 +00:00
Alexander Alekhin
c8ff7a4867
build: fix opencv_world with CUDA
2016-01-14 17:23:55 +03:00
Alexander Alekhin
fade402899
Merge pull request #5861 from alalek:fix_pkgconfig
2016-01-04 06:58:19 +00:00
Dan Moodie
64a57f7c38
Support for opengl2 in vtk 7.1
2015-12-28 14:04:02 -05:00
Alexander Alekhin
5fa64235b1
Merge pull request #5860 from Dikay900:patch-1
2015-12-24 09:08:06 +00:00
Alexander Alekhin
f91ada572a
Merge pull request #5858 from mshabunin:fix-arm-cross-warnings
2015-12-24 09:07:29 +00:00
atinfinity
d16723f493
changed to find TBB library(VS2015)
2015-12-23 23:45:33 +09:00
atinfinity
c4e80952ce
changed to find TBB library(VS2015)
2015-12-23 23:43:01 +09:00
Alexander Alekhin
24dbb43c09
pkg-config: modules list contains only OpenCV modules ( fixes #5852 )
2015-12-22 17:28:38 +03:00
Philip
e85b23573b
[master] Fixed PCH warning during ARM crosscompilation
...
#5858 for master
2015-12-22 15:24:02 +01:00
Maksim Shabunin
46edb54ac3
Fixed PCH warning during ARM crosscompilation
2015-12-22 15:58:39 +03:00
Alexander Alekhin
2f4b334ef2
fix MSVS2010 builds
2015-12-18 17:23:17 +03:00
Alexander Alekhin
d34297b516
fix include path for windows package
2015-12-18 13:50:35 +03:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
2015-12-17 16:48:02 +00:00
Vincent Rabaud
932043fdc2
Properly check for version in find_package
...
If I ask for version 2, the current trunk version (version 3), will say it is compatible, which is erroneous.
Do not consider different major versions compatible in cmake config file
2015-12-17 17:00:30 +03:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Maksim Shabunin
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
2015-12-15 12:24:36 +00:00
Vadim Pisarevsky
5ac1d8323e
Merge pull request #5797 from alalek:fix_5018
2015-12-14 16:54:22 +00:00
Alexander Alekhin
f0c14888d5
fixes #5018 : fix framework links in opencv.pc (MacOS)
2015-12-14 15:14:23 +03:00
Alexander Alekhin
5d346128f7
workaround: cvconfig.h doesn't work with hal at this moment
2015-12-14 13:52:02 +03:00
Alexander Alekhin
2bfad68812
pkg-config: remove $<LINK_ONLY:...> expressions
2015-12-12 15:23:31 +03:00
Alexander Alekhin
7afce8e003
world build: fix modules instantiation order
...
opencv_hal before opencv_world
opencv_world before opencv_ts
2015-12-12 15:23:31 +03:00
Alexander Alekhin
fe2f5c175a
distrib: remove useless static files from shared distribution package
2015-12-12 15:23:31 +03:00
Alexander Alekhin
8f732f2cfe
fix samples deps
...
some tutorials depends on contrib modules
2015-12-12 15:23:31 +03:00
Dan
46ec9c386b
Gstreamer 1.0 on windows.
2015-12-09 09:11:45 -05:00
Ilya Lavrenov
4fa14f75b8
suppress lintian warning in opencv.pc
2015-12-09 13:47:09 +03:00
Vadim Pisarevsky
9c0a5523e4
Merge pull request #5757 from alalek:merge-2.4
2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
Vadim Pisarevsky
54c1637ba1
Merge pull request #5743 from mshabunin:hal_extend
2015-12-07 10:01:22 +00:00
Sethur
c68d15bebe
Fixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS
2015-12-04 15:07:41 +01:00
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