diff --git a/cmake/OpenCVGenAndroidMK.cmake b/cmake/OpenCVGenAndroidMK.cmake index 2622d2aaed..82b2a83cac 100644 --- a/cmake/OpenCVGenAndroidMK.cmake +++ b/cmake/OpenCVGenAndroidMK.cmake @@ -19,6 +19,22 @@ if(ANDROID) set(OPENCV_STATIC_LIBTYPE_CONFIGMAKE ${OPENCV_LIBTYPE_CONFIGMAKE}) endif() + if (NOT COMMAND ANDROID_GET_ABI_RAWNAME) + macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR ) + if( " ${TOOLCHAIN_FLAG}" STREQUAL " ARMEABI" ) + set( ${VAR} "armeabi" ) + elseif( " ${TOOLCHAIN_FLAG}" STREQUAL " ARMEABI_V7A" ) + set( ${VAR} "armeabi-v7a" ) + elseif( " ${TOOLCHAIN_FLAG}" STREQUAL " X86" ) + set( ${VAR} "x86" ) + elseif( " ${TOOLCHAIN_FLAG}" STREQUAL " MIPS" ) + set( ${VAR} "mips" ) + else() + set( ${VAR} "unknown" ) + endif() + endmacro() + endif() + # setup lists of camera libs foreach(abi ARMEABI ARMEABI_V7A X86 MIPS) ANDROID_GET_ABI_RAWNAME(${abi} ndkabi)