From 01b3266612ddd7ca590dac6301edf3d894068515 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 30 Jun 2011 14:56:39 +0000 Subject: [PATCH] Fixed Android target name for Android samples and tests --- modules/java/CMakeLists.txt | 2 +- samples/android/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 1d1cf3bc0a..01671bc9f7 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/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" ) diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 1bda5fbd64..692a73e8c1 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -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" )