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

(trunk) Do not use prebuilt Android camera libs for armeabi hardware target

Browse Source
This commit is contained in:
Andrey Kamaev 2011-06-20 15:57:42 +00:00
parent 9c71134caf
commit ea58cdc71d
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -1241,16 +1241,18 @@ if(ANDROID)
else() else()
SET(OPENCV_LIBTYPE_CONFIGMAKE "STATIC") SET(OPENCV_LIBTYPE_CONFIGMAKE "STATIC")
endif() endif()
if(BUILD_ANDROID_CAMERA_WRAPPER) if(ARMEABI_V7A)
set(CMAKE_CAMERA_LIBS_CONFIGCMAKE "native_camera_r${ANDROID_VERSION}") if(BUILD_ANDROID_CAMERA_WRAPPER)
else() set(CMAKE_CAMERA_LIBS_CONFIGCMAKE "native_camera_r${ANDROID_VERSION}")
SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "") else()
file(GLOB CMAKE_CAMERA_LIBS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/libnative_camera_r*.so") SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "")
foreach(cam_lib ${CMAKE_CAMERA_LIBS}) file(GLOB CMAKE_CAMERA_LIBS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/libnative_camera_r*.so")
get_filename_component(cam_lib "${cam_lib}" NAME) foreach(cam_lib ${CMAKE_CAMERA_LIBS})
string(REGEX REPLACE "lib(native_camera_r[0-9]+\\.[0-9]+\\.[0-9]+)\\.so" "\\1" cam_lib "${cam_lib}") get_filename_component(cam_lib "${cam_lib}" NAME)
SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "${CMAKE_CAMERA_LIBS_CONFIGCMAKE} ${cam_lib}") string(REGEX REPLACE "lib(native_camera_r[0-9]+\\.[0-9]+\\.[0-9]+)\\.so" "\\1" cam_lib "${cam_lib}")
endforeach() SET(CMAKE_CAMERA_LIBS_CONFIGCMAKE "${CMAKE_CAMERA_LIBS_CONFIGCMAKE} ${cam_lib}")
endforeach()
endif()
endif() endif()
endif(ANDROID) endif(ANDROID)
# ------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------
@ -1517,11 +1519,15 @@ message(STATUS " V4L/V4L2: ${HAVE_CAMV4L}/${HAVE_CAMV4L2}")
endif() endif()
message(STATUS " Xine: ${HAVE_XINE}") message(STATUS " Xine: ${HAVE_XINE}")
if(ANDROID) if(ANDROID)
if (ARMEABI_V7A)
if(BUILD_ANDROID_CAMERA_WRAPPER) if(BUILD_ANDROID_CAMERA_WRAPPER)
message(STATUS " AndroidNativeCamera: build for Android ${ANDROID_VERSION}") message(STATUS " AndroidNativeCamera: build for Android ${ANDROID_VERSION}")
else() else()
message(STATUS " AndroidNativeCamera: use prebuilt libraries") message(STATUS " AndroidNativeCamera: use prebuilt libraries")
endif(BUILD_ANDROID_CAMERA_WRAPPER) endif(BUILD_ANDROID_CAMERA_WRAPPER)
else(ARMEABI_V7A)
message(STATUS " AndroidNativeCamera: NO")
endif(ARMEABI_V7A)
endif() endif()
endif() #if(UNIX AND NOT APPLE) endif() #if(UNIX AND NOT APPLE)

2
modules/androidcamera/CMakeLists.txt
View File

@ -37,7 +37,7 @@ IF (NOT BUILD_SHARED_LIBS)
) )
ENDIF() 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") file(GLOB camera_wrappers "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/lib/libnative_camera_r*.so")
foreach(wrapper ${camera_wrappers}) foreach(wrapper ${camera_wrappers})