Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 4 Jul 2021 21:24:40 +0000 (21:24 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 4 Jul 2021 21:24:40 +0000 (21:24 +0000)
1  2 
cmake/OpenCVCompilerOptions.cmake

Simple merge