Merge pull request #6691 from alalek:cmake_fix_android_samples_2.4

pull/6692/head
Alexander Alekhin 9 years ago
commit dafb4b81da
  1. 2
      cmake/OpenCVDetectAndroidSDK.cmake

@ -290,7 +290,7 @@ macro(add_android_project target path)
set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android) set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android)
endif() endif()
add_library(${JNI_LIB_NAME} MODULE ${android_proj_jni_files}) add_library(${JNI_LIB_NAME} SHARED ${android_proj_jni_files})
target_link_libraries(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_proj_NATIVE_DEPS}) target_link_libraries(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_proj_NATIVE_DEPS})
set_target_properties(${JNI_LIB_NAME} PROPERTIES set_target_properties(${JNI_LIB_NAME} PROPERTIES

Loading…
Cancel
Save