mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-16 16:32:49 +00:00
commit 47dea29e4e
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmake/OpenCVDetectAndroidSDK.cmake
View File

@ -302,6 +302,27 @@ macro(add_android_project target path)
else()
list(APPEND android_proj_extra_deps opencv_java_android)
endif()
set(_native_deps "")
if(NOT android_proj_IGNORE_JAVA)
set(_native_deps opencv_java)
endif()
if(android_proj_native_deps)
list(APPEND _native_deps ${android_proj_native_deps})
endif()
if(_native_deps)
list(APPEND android_proj_extra_deps ${_native_deps})
endif()
if((android_proj_COPY_LIBS OR ANDROID_EXAMPLES_WITH_LIBS) AND _native_deps)
message(STATUS "Android project with native libs: " ${target} " (" ${_native_deps} ")")
ocv_copyfiles_append_dir(NATIVE_COPY "${OpenCV_BINARY_DIR}/lib" "${android_proj_bin_dir}/libs" "${OpenCV_BINARY_DIR}/lib/*.so")
ocv_copyfiles_add_target(${target}_copy_libs NATIVE_COPY "Copy native libs for project: ${target}" ${_native_deps})
list(APPEND android_proj_extra_deps ${target}_copy_libs)
endif()
add_custom_command(
OUTPUT "${android_proj_bin_dir}/bin/${target}-debug.apk"
COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug -Djava.target=1.6 -Djava.source=1.6
@ -315,26 +336,6 @@ macro(add_android_project target path)
add_custom_target(${target} ALL SOURCES "${android_proj_bin_dir}/bin/${target}-debug.apk" )
set(_native_deps "")
if(NOT android_proj_IGNORE_JAVA)
set(_native_deps opencv_java)
endif()
if(android_proj_native_deps)
list(APPEND _native_deps ${android_proj_native_deps})
endif()
if(_native_deps)
add_dependencies(${target} ${_native_deps})
endif()
if((android_proj_COPY_LIBS OR ANDROID_EXAMPLES_WITH_LIBS) AND _native_deps)
message(STATUS "Android project with native libs: " ${target} " (" ${_native_deps} ")")
ocv_copyfiles_append_dir(NATIVE_COPY "${OpenCV_BINARY_DIR}/lib" "${android_proj_bin_dir}/libs" "${OpenCV_BINARY_DIR}/lib/*.so")
ocv_copyfiles_add_target(${target}_copy_libs NATIVE_COPY "Copy native libs for project: ${target}" ${_native_deps})
add_dependencies(${target} ${target}_copy_libs)
endif()
# There is some strange problem with concurrent Android .APK builds:
# <android-sdk>/tools/ant/build.xml:781: Problem reading <build_dir>/bin/classes.jar'
if(__android_project_chain)

2
cmake/copy_files.cmake
View File

@ -25,7 +25,7 @@ macro(copy_file_ src dst prefix)
endif()
get_filename_component(target_path "${dst}" PATH)
file(MAKE_DIRECTORY "${target_path}")
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${src} ${dst}
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${src}" "${dst}"
RESULT_VARIABLE SYMLINK_RESULT)
if(NOT SYMLINK_RESULT EQUAL 0)
#message("Symlink failed, fallback to 'copy'")