Alexander Alekhin
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Alexander Alekhin
ffaf15d0d9
cmake: reuse OpenCV NEON detection in carotene
...
- use carotene if NEON available only
2020-01-24 16:42:56 +03:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00:00
Augusto Fraga Giachero
2d778434f1
Enable cmake CMP0077 policy
...
When building OpenCV as a sub-project using cmake's add_subdirectory()
the OpenCV's build options would be overwritten to its default
state. With cmake 3.13+ the CMP0077 policy, option() honors previous
definitions via set().
2020-01-08 14:10:45 -03:00
Alexander Alekhin
4b0132ed7a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-02 16:26:52 +03:00
Lubov Batanina
7523c777c5
Merge pull request #15537 from l-bat:ngraph
...
* Support nGraph
* Fix resize
2019-12-02 16:16:06 +03:00
Alexander Alekhin
65573784c4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-09 19:46:18 +00:00
Maksim Shabunin
1ca74c3c03
Merge pull request #15544 from mshabunin:disable_posix_memalign
...
* Disable posix_memalign by default
* core: fix memalign parameter handling
2019-10-09 14:06:12 +03:00
Alexander Alekhin
a74fe2ec01
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-20 21:11:49 +00:00
dab0bby
a9163a53d3
Merge pull request #15477 from dab0bby:remove-old-build-java-option
...
* remove old BUILD_opencv_java option
* replace old build_java option with new BUILD_JAVA option
2019-09-18 18:30:01 +03:00
Maksim Shabunin
8c849a48cc
Ported install layout refactoring from master branch
2019-08-29 17:01:49 +03:00
Maksim Shabunin
4e67eb6c42
Extracted install layout configuration to separate file
2019-08-26 18:15:32 +03:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
Ilya Lavrenov
d0c4a92b4c
Adopted detection of Inference Engine
2019-08-23 17:37:57 +03:00
Alexander Alekhin
464972855e
cmake: add libatomic check
2019-08-21 13:02:36 +03:00
Alexander Alekhin
19a4b51371
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-16 18:48:08 +03:00
Alexander Alekhin
5ef548a985
cmake: update initialization
2019-08-08 15:23:16 +03:00
Alexander Alekhin
174b4ce29d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-05 18:11:43 +00:00
Mark Harfouche
63775320ae
Verify Carbon correctly on OSX
2019-08-04 18:26:28 -04:00
Maksim Shabunin
1275248f39
PCH: disable by default on all platforms except MSVC
2019-07-31 15:20:01 +03:00
Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Hugo Lindström
2ee00e7f7d
Merge pull request #15059 from hugolm84:improved-support-for-wince
...
* Improve support for Windows Embedded Compact
* Remove redundant set(WINCE true) and format CMake
2019-07-24 23:12:09 +03:00
Giles Payne
a897fc91ec
Add no_samples_build option to Android SDK build
2019-07-18 21:31:02 +09:00
Alexander Alekhin
095f44f4b2
cmake: disable WITH_NVCUVID by default due build failures
2019-07-15 17:09:07 +03:00
Alexander Alekhin
8408587341
Merge pull request #14888 from vchiluka5:NVIDIA_Optical_Flow
2019-07-07 17:20:53 +03:00
Alexander Alekhin
0fc584961c
cmake: workaround to fix link issues with stubs/libcuda.so.1
2019-07-06 16:29:59 +00:00
Alexander Alekhin
43eba3d750
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-04 18:44:13 +03:00
Alexander Alekhin
ca022fdb4c
3rdparty(itt): support AARCH64
2019-07-03 18:35:43 +03:00
Vishal Chiluka
0e9a865bbf
Moved NVIDIA_Optical_Flow sample app to opencv_contrib
...
Description:
Moved NVIDIA_Optical_flow sample app and comparison app to
opencv_contrib branch. Added CUDA_CUDA_LIBRARY in CMakeLists.txt for
resolving linker errors.
2019-06-28 09:19:26 +05:30
Alexander Alekhin
66d7956e67
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-15 16:25:11 +00:00
Alexander Alekhin
3697ebef47
cmake: typo in hook name
2019-06-14 19:07:54 +03:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +00:00
Alexander Alekhin
878af7ada8
Merge pull request #14725 from alalek:update_openexr_2.3.0
...
3rdparty: update OpenEXR 2.3.0 (#14725 )
* openexr 2.2.1
* openexr 2.3.0
* openexr: build fixes
* openexr: build dwa tables on-demand
2019-06-10 20:04:23 +03:00
Alexander Alekhin
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
Alexander Alekhin
aab9ef4290
Merge pull request #14667 from asashour:javadoc
2019-06-06 10:57:39 +00:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Ahmed Ashour
5c56b8ce92
java: generated code to have javadoc
2019-06-05 12:44:03 +02:00
Yashas Samaga B L
ae279966c2
Merge pull request #14660 from YashasSamaga:dnn-cuda-build
...
add cuDNN dependency and setup build for cuda4dnn (#14660 )
* update cmake for cuda4dnn
- Adds FindCUDNN
- Adds new options:
* WITH_CUDA
* OPENCV_DNN_CUDA
- Adds CUDA4DNN preprocessor symbol for the DNN module
* FIX: append EXCLUDE_CUDA instead of overwrite
* remove cuDNN dependency for user apps
* fix unused variable warning
2019-06-02 14:47:15 +03:00
Alexander Alekhin
d8b42792a6
cmake: update ENABLE_FAST_MATH option
2019-05-30 19:44:35 +03:00
Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Maksim Shabunin
a550e50683
Fix IE status message on MacOS
2019-05-27 10:26:16 +03:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Sergiu Deitsch
bc4b2d521c
Merge pull request #13337 from sergiud:eigen-cross-compile
...
* added support for Eigen cross-compilation
* cmake: fix Eigen detection
2019-05-20 21:05:42 +03:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00
Alexander Alekhin
82be2d6210
Merge pull request #14430 from alalek:cmake_fix_include_pkgconfig_3.4
2019-04-26 20:18:59 +00:00
Alexander Alekhin
90c34c5c17
cmake: fix pkg-config handling
...
backporting commit c9f3f4d1d3
2019-04-26 18:25:47 +03:00
Alexander Alekhin
c9f3f4d1d3
cmake: fix pkg-config handling
...
Avoid non-intentional call of "include(FindPkgConfig)"
It should be handled in the root CMakeLists.txt (safely for cross-compiling)
2019-04-26 18:19:03 +03:00
Alexander Alekhin
c1981f28ad
build: +OPENCV_ENABLE_MEMORY_SANITIZER flag
2019-04-22 21:35:25 +00:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
0d747daf47
cmake: use absolute library paths from 'pkgconfig'
...
- drop legacy check_module() macro
- drop 'ALIASOF_'
2019-04-15 22:11:49 +00:00