Merge pull request #531 from asmorkalov:android_mips_fix

9bbb0ed0 · Andrey Kamaev · OpenCV Buildbot · 051aa4cb · 4bbdfbc9 · 9bbb0ed0
Commit 9bbb0ed0 authored Feb 22, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Feb 22, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

OpenCVGenAndroidMK.cmake cmake/OpenCVGenAndroidMK.cmake +1 -1

OpenCV.mk.in cmake/templates/OpenCV.mk.in +3 -0

No files found.
--- 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)

--- 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