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
2022-10-15 16:08:07 +00:00
parent 2763f988da ea5ca16036
commit 762481411d
41 changed files with 1216 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/android.toolchain.cmake
+2 -2
View File
@@ -399,7 +399,7 @@ if( NOT ANDROID_NDK )
__INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN )
if( NOT ANDROID_STANDALONE_TOOLCHAIN )
#try to find Android NDK in one of the the default locations
#try to find Android NDK in one of the default locations
set( __ndkSearchPaths )
foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} )
foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} )
@@ -413,7 +413,7 @@ if( NOT ANDROID_NDK )
message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" )
message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" )
else()
#try to find Android standalone toolchain in one of the the default locations
#try to find Android standalone toolchain in one of the default locations
__INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
if( ANDROID_STANDALONE_TOOLCHAIN )