Fixed dependencies for Android projects

diff --git a/OpenCVAndroidProject.cmake b/OpenCVAndroidProject.cmake
index 222439e..3adc3cb 100644 (file)
--- a/OpenCVAndroidProject.cmake
+++ b/OpenCVAndroidProject.cmake
@@ -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 .\r
                 WORKING_DIRECTORY ${build_path}\r
                 DEPENDS ${${_target}_project_files}\r
-                DEPENDS opencv_java_android_library\r
+                DEPENDS "${CMAKE_BINARY_DIR}/default.properties"\r
+                DEPENDS "${CMAKE_BINARY_DIR}/AndroidManifest.xml"\r
                 COMMENT "Updating android project - ${_target}"\r
                 )\r
         else()\r
@@ -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"\r
             WORKING_DIRECTORY ${build_path}\r
             DEPENDS ${${_target}_project_files}\r
-            DEPENDS ${JNI_LIB_NAME} opencv_java\r
             COMMENT "Generating bin/${_target}.apk"\r
         )\r
 \r
@@ -133,6 +133,8 @@ macro(add_android_project _target _path)
             DEPENDS "${CMAKE_BINARY_DIR}/bin/${_target}.apk"\r
             )\r
 \r
+        add_dependencies(${_target}_android_project opencv_java ${JNI_LIB_NAME})\r
+\r
         if("${ARGN}" STREQUAL "INSTALL" AND INSTALL_ANDROID_EXAMPLES)\r
             install(FILES "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DESTINATION "bin" COMPONENT main)\r
         endif()\r