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

Fixed dependencies for Android projects

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-26 07:32:33 +00:00
parent 3b59a51347
commit 617bb92e8c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenCVAndroidProject.cmake
View File

@ -63,7 +63,8 @@ macro(add_android_project _target _path)
COMMAND ${ANDROID_EXECUTABLE} update project --name "${_target}" --target "${ANDROID_SDK_TARGET}" --library "${OPENCV_REFERENCE_PATH}" --path . COMMAND ${ANDROID_EXECUTABLE} update project --name "${_target}" --target "${ANDROID_SDK_TARGET}" --library "${OPENCV_REFERENCE_PATH}" --path .
WORKING_DIRECTORY ${build_path} WORKING_DIRECTORY ${build_path}
DEPENDS ${${_target}_project_files} DEPENDS ${${_target}_project_files}
DEPENDS opencv_java_android_library DEPENDS "${CMAKE_BINARY_DIR}/default.properties"
DEPENDS "${CMAKE_BINARY_DIR}/AndroidManifest.xml"
COMMENT "Updating android project - ${_target}" COMMENT "Updating android project - ${_target}"
) )
else() else()
@ -124,7 +125,6 @@ macro(add_android_project _target _path)
COMMAND ${CMAKE_COMMAND} -E copy "${build_path}/bin/${_target}-debug.apk" "${CMAKE_BINARY_DIR}/bin/${_target}.apk" COMMAND ${CMAKE_COMMAND} -E copy "${build_path}/bin/${_target}-debug.apk" "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
WORKING_DIRECTORY ${build_path} WORKING_DIRECTORY ${build_path}
DEPENDS ${${_target}_project_files} DEPENDS ${${_target}_project_files}
DEPENDS ${JNI_LIB_NAME} opencv_java
COMMENT "Generating bin/${_target}.apk" COMMENT "Generating bin/${_target}.apk"
) )
@ -133,6 +133,8 @@ macro(add_android_project _target _path)
DEPENDS "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DEPENDS "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
) )
add_dependencies(${_target}_android_project opencv_java ${JNI_LIB_NAME})
if("${ARGN}" STREQUAL "INSTALL" AND INSTALL_ANDROID_EXAMPLES) if("${ARGN}" STREQUAL "INSTALL" AND INSTALL_ANDROID_EXAMPLES)
install(FILES "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DESTINATION "bin" COMPONENT main) install(FILES "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DESTINATION "bin" COMPONENT main)
endif() endif()