potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43: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
2022-08-14 15:50:42 +00:00
parent d09cc0f30c cc8add9f66
commit 2ebdc04787
37 changed files with 246 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/android.toolchain.cmake
+1 -1
View File
@@ -189,7 +189,7 @@
#
# ------------------------------------------------------------------------------
cmake_minimum_required( VERSION 2.6.3 )
cmake_minimum_required( VERSION 2.8.12.2 )
if( DEFINED CMAKE_CROSSCOMPILING )
# subsequent toolchain loading is not really needed