diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dfb3d0d82..3fb55c094f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1241,16 +1241,18 @@ if(ANDROID) else() SET(OPENCV_LIBTYPE_CONFIGMAKE "STATIC") endif() - if(BUILD_ANDROID_CAMERA_WRAPPER) - set(CMAKE_CAMERA_LIBS_CONFIGCMAKE "native_camera_r${ANDROID_VERSION}") - else() - SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "") - file(GLOB CMAKE_CAMERA_LIBS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/libnative_camera_r*.so") - foreach(cam_lib ${CMAKE_CAMERA_LIBS}) - get_filename_component(cam_lib "${cam_lib}" NAME) - string(REGEX REPLACE "lib(native_camera_r[0-9]+\\.[0-9]+\\.[0-9]+)\\.so" "\\1" cam_lib "${cam_lib}") - SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "${CMAKE_CAMERA_LIBS_CONFIGCMAKE} ${cam_lib}") - endforeach() + if(ARMEABI_V7A) + if(BUILD_ANDROID_CAMERA_WRAPPER) + set(CMAKE_CAMERA_LIBS_CONFIGCMAKE "native_camera_r${ANDROID_VERSION}") + else() + SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "") + file(GLOB CMAKE_CAMERA_LIBS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/libnative_camera_r*.so") + foreach(cam_lib ${CMAKE_CAMERA_LIBS}) + get_filename_component(cam_lib "${cam_lib}" NAME) + string(REGEX REPLACE "lib(native_camera_r[0-9]+\\.[0-9]+\\.[0-9]+)\\.so" "\\1" cam_lib "${cam_lib}") + SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "${CMAKE_CAMERA_LIBS_CONFIGCMAKE} ${cam_lib}") + endforeach() + endif() endif() endif(ANDROID) # ------------------------------------------------------------------------------------------- @@ -1517,11 +1519,15 @@ message(STATUS " V4L/V4L2: ${HAVE_CAMV4L}/${HAVE_CAMV4L2}") endif() message(STATUS " Xine: ${HAVE_XINE}") if(ANDROID) +if (ARMEABI_V7A) if(BUILD_ANDROID_CAMERA_WRAPPER) message(STATUS " AndroidNativeCamera: build for Android ${ANDROID_VERSION}") else() message(STATUS " AndroidNativeCamera: use prebuilt libraries") endif(BUILD_ANDROID_CAMERA_WRAPPER) +else(ARMEABI_V7A) +message(STATUS " AndroidNativeCamera: NO") +endif(ARMEABI_V7A) endif() endif() #if(UNIX AND NOT APPLE) diff --git a/modules/androidcamera/CMakeLists.txt b/modules/androidcamera/CMakeLists.txt index ecc45974f1..908ebd2592 100644 --- a/modules/androidcamera/CMakeLists.txt +++ b/modules/androidcamera/CMakeLists.txt @@ -37,7 +37,7 @@ IF (NOT BUILD_SHARED_LIBS) ) ENDIF() -if (NOT BUILD_ANDROID_CAMERA_WRAPPER) +if (ARMEABI_V7A AND NOT BUILD_ANDROID_CAMERA_WRAPPER) file(GLOB camera_wrappers "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/lib/libnative_camera_r*.so") foreach(wrapper ${camera_wrappers}) @@ -51,4 +51,4 @@ if (NOT BUILD_ANDROID_CAMERA_WRAPPER) DESTINATION lib COMPONENT main) endforeach() -endif() \ No newline at end of file +endif()