Fixed Android target name for Android samples and tests

pull/13383/head
Andrey Kamaev 14 years ago
parent 9fbd47ffb1
commit 01b3266612
  1. 2
      modules/java/CMakeLists.txt
  2. 2
      samples/android/CMakeLists.txt

@ -151,7 +151,7 @@ if(ANDROID AND BUILD_TESTS AND CAN_BUILD_ANDROID_PROJECTS)
WORKING_DIRECTORY ${test_dir}
COMMAND ${CMAKE_COMMAND} -E remove -f "${test_dir}/default.properties"
COMMAND ${CMAKE_COMMAND} -E touch "${test_dir}/default.properties"
COMMAND ${ANDROID_EXECUTABLE} update project --name "${test_target}" --target 7 --library "${OPENCV_REFERENCE_PATH}" --path .
COMMAND ${ANDROID_EXECUTABLE} update project --name "${test_target}" --target android-8 --library "${OPENCV_REFERENCE_PATH}" --path .
COMMAND ${ANT_EXECUTABLE} debug
COMMAND ${CMAKE_COMMAND} -E copy "${test_dir}/bin/${test_target}-debug.apk" "${CMAKE_BINARY_DIR}/bin/${test_target}-debug.apk"
)

@ -50,7 +50,7 @@ if (BUILD_EXAMPLES)
WORKING_DIRECTORY ${sample_dir}
COMMAND ${CMAKE_COMMAND} -E remove -f "${sample_dir}/default.properties"
COMMAND ${CMAKE_COMMAND} -E touch "${sample_dir}/default.properties"
COMMAND ${ANDROID_EXECUTABLE} update project --name "${sample}" --target 7 ${opencv_reference} --path .
COMMAND ${ANDROID_EXECUTABLE} update project --name "${sample}" --target android-8 ${opencv_reference} --path .
COMMAND ${ANT_EXECUTABLE} debug
COMMAND ${CMAKE_COMMAND} -E copy "${sample_dir}/bin/${sample}-debug.apk" "${CMAKE_BINARY_DIR}/bin/${sample}-debug.apk"
)

Loading…
Cancel
Save