Fixed Android target name for Android samples and tests
authorAndrey Kamaev <no@email>
Thu, 30 Jun 2011 14:56:39 +0000 (14:56 +0000)
committerAndrey Kamaev <no@email>
Thu, 30 Jun 2011 14:56:39 +0000 (14:56 +0000)
modules/java/CMakeLists.txt
samples/android/CMakeLists.txt

index 1d1cf3b..01671bc 100644 (file)
@@ -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"
         )
index 1bda5fb..692a73e 100644 (file)
@@ -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"
         )