From 4bbdfbc9e79cab9e22e42038d9b7030a3cd6974b Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 22 Feb 2013 11:57:42 +0400 Subject: [PATCH] Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed. Native camera libs for MIPS installation fixed. --- cmake/OpenCVGenAndroidMK.cmake | 2 +- cmake/templates/OpenCV.mk.in | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVGenAndroidMK.cmake b/cmake/OpenCVGenAndroidMK.cmake index 5b11afc..ba67f41 100644 --- a/cmake/OpenCVGenAndroidMK.cmake +++ b/cmake/OpenCVGenAndroidMK.cmake @@ -20,7 +20,7 @@ if(ANDROID) endif() # setup lists of camera libs - foreach(abi ARMEABI ARMEABI_V7A X86) + foreach(abi ARMEABI ARMEABI_V7A X86 MIPS) ANDROID_GET_ABI_RAWNAME(${abi} ndkabi) if(BUILD_ANDROID_CAMERA_WRAPPER) if(ndkabi STREQUAL ANDROID_NDK_ABI_NAME) diff --git a/cmake/templates/OpenCV.mk.in b/cmake/templates/OpenCV.mk.in index 943d7cb..8c1b855 100644 --- a/cmake/templates/OpenCV.mk.in +++ b/cmake/templates/OpenCV.mk.in @@ -57,6 +57,9 @@ ifeq (${OPENCV_CAMERA_MODULES},on) ifeq ($(TARGET_ARCH_ABI),x86) OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_X86_CONFIGCMAKE@ endif + ifeq ($(TARGET_ARCH_ABI),mips) + OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_MIPS_CONFIGCMAKE@ + endif else OPENCV_CAMERA_MODULES:= endif -- 2.7.4