generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

Browse Source 
Native camera libs for MIPS installation fixed.
This commit is contained in:
Alexander Smorkalov 2013-02-22 11:57:42 +04:00
parent dea6148a1a
commit 4bbdfbc9e7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVGenAndroidMK.cmake
View File

@ -20,7 +20,7 @@ if(ANDROID)
endif() endif()
# setup lists of camera libs # setup lists of camera libs
foreach(abi ARMEABI ARMEABI_V7A X86) foreach(abi ARMEABI ARMEABI_V7A X86 MIPS)
ANDROID_GET_ABI_RAWNAME(${abi} ndkabi) ANDROID_GET_ABI_RAWNAME(${abi} ndkabi)
if(BUILD_ANDROID_CAMERA_WRAPPER) if(BUILD_ANDROID_CAMERA_WRAPPER)
if(ndkabi STREQUAL ANDROID_NDK_ABI_NAME) if(ndkabi STREQUAL ANDROID_NDK_ABI_NAME)

3
cmake/templates/OpenCV.mk.in
View File

@ -57,6 +57,9 @@ ifeq (${OPENCV_CAMERA_MODULES},on)
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),x86)
OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_X86_CONFIGCMAKE@ OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_X86_CONFIGCMAKE@
endif endif
ifeq ($(TARGET_ARCH_ABI),mips)
OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_MIPS_CONFIGCMAKE@
endif
else else
OPENCV_CAMERA_MODULES:= OPENCV_CAMERA_MODULES:=
endif endif