potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2020-02-04 19:49:24 +03:00
parent 0dd1ce1a4f 0cb3bf95f1
commit 225566da7b
14 changed files with 577 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVUtils.cmake
+2 -2
View File
@@ -402,8 +402,8 @@ endmacro()
set(OCV_COMPILER_FAIL_REGEX
"argument .* is not valid" # GCC 9+ (including support of unicode quotes)
"command line option .* is valid for .* but not for C\\+\\+" # GNU
"command line option .* is valid for .* but not for C" # GNU
"command[- ]line option .* is valid for .* but not for C\\+\\+" # GNU
"command[- ]line option .* is valid for .* but not for C" # GNU
"unrecognized .*option" # GNU
"unknown .*option" # Clang
"ignoring unknown option" # MSVC