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

2011-06-20 15:57:42 +00:00
parent 9c71134caf
commit ea58cdc71d
2 changed files with 17 additions and 11 deletions
--- 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})