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

revert: java bindings become CMake modules (loadable plugins)

Browse Source 
This reverts part of commit 0db10a3052a33c7326517e8140e36d46d430a3f5
This commit is contained in:
Alexander Alekhin 2016-03-09 12:12:30 +03:00
parent 9ebbfc7bdb
commit cbd0ee21d5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/java/CMakeLists.txt
View File

@ -347,16 +347,9 @@ endif(ANDROID)
# workarounding lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT # workarounding lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
string(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
if(ANDROID) ocv_add_library(${the_module} SHARED ${handwritten_h_sources} ${handwritten_cpp_sources} ${generated_cpp_sources}
# Android native code need to link with libopencv_java.so
ocv_add_library(${the_module} SHARED ${handwritten_h_sources} ${handwritten_cpp_sources} ${generated_cpp_sources}
${copied_files} ${copied_files}
"${JAR_FILE}" "${JAR_FILE}.dephelper") "${JAR_FILE}" "${JAR_FILE}.dephelper")
else()
ocv_add_library(${the_module} MODULE ${handwritten_h_sources} ${handwritten_cpp_sources} ${generated_cpp_sources}
${copied_files}
"${JAR_FILE}" "${JAR_FILE}.dephelper")
endif()
if(BUILD_FAT_JAVA_LIB) if(BUILD_FAT_JAVA_LIB)
set(__deps ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_MODULES_BUILD}) set(__deps ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_MODULES_BUILD})