[opencv] 12/71: cmake: fix JNI configuration problem for Android samples

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit c6be51eecd923cef6eac7c8eb60ca7eb9e41c19b
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Thu Jun 16 14:29:36 2016 +0300

    cmake: fix JNI configuration problem for Android samples
    
    Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
    with following build error message:
        ld: fatal error: -soname: must take a non-empty argument
    
    Linker command line sample contains this:
    "-shared -Wl,-soname, -o"
---
 cmake/OpenCVDetectAndroidSDK.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/OpenCVDetectAndroidSDK.cmake b/cmake/OpenCVDetectAndroidSDK.cmake
index a518d85..38430e2 100644
--- a/cmake/OpenCVDetectAndroidSDK.cmake
+++ b/cmake/OpenCVDetectAndroidSDK.cmake
@@ -290,7 +290,7 @@ macro(add_android_project target path)
           set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android)
         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})
 
         set_target_properties(${JNI_LIB_NAME} PROPERTIES

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git