Fixed install terget for Android examples

14 years ago · e7642f66d9
parent ac7e16fdf6
commit e7642f66d9
2 changed files with 6 additions and 2 deletions
--- a/OpenCVAndroidProject.cmake
+++ b/OpenCVAndroidProject.cmake
@ -132,5 +132,9 @@ macro(add_android_project _target _path)
            DEPENDS "${build_path}/bin/${_target}-debug.apk"
            DEPENDS "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
            )
+
+        if("${ARGN}" STREQUAL "INSTALL" AND INSTALL_ANDROID_EXAMPLES)
+            install(FILES "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DESTINATION "bin" COMPONENT main)
+        endif()
    endif()
-endmacro()
+endmacro()
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@ -31,7 +31,7 @@ if (BUILD_ANDROID_EXAMPLES)
    
    foreach(sample ${android_samples})
        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml")
-            add_android_project("${sample}" "${CMAKE_CURRENT_SOURCE_DIR}/${sample}")
+            add_android_project("${sample}" "${CMAKE_CURRENT_SOURCE_DIR}/${sample}" INSTALL)
        endif()
    endforeach()