Fixed install terget for Android examples

pull/13383/head
Andrey Kamaev 14 years ago
parent ac7e16fdf6
commit e7642f66d9
  1. 6
      OpenCVAndroidProject.cmake
  2. 2
      samples/android/CMakeLists.txt

@ -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()

@ -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()

Loading…
Cancel
Save