Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 11 Oct 2020 17:19:22 +0000 (17:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 11 Oct 2020 17:19:22 +0000 (17:19 +0000)
1  2 
cmake/OpenCVDetectCUDA.cmake

Simple merge