diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94375cfb7f5b9c077944685ab65f6e68f7f76909..d0a0dd5988a1d73228598a41d83058a70c0d4551 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,6 +455,9 @@ include(cmake/OpenCVDetectPython.cmake REQUIRED)
if((NOT DEFINED BUILD_opencv_java OR BUILD_opencv_java) AND PYTHON_EXECUTABLE)
if(ANDROID)
include(cmake/OpenCVDetectAndroidSDK.cmake REQUIRED)
+ if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
+ message(WARNING "OpenCV requires Android SDK tool revision 14 or newer. Otherwise tests and samples will no be compiled.")
+ endif()
endif()
include(cmake/OpenCVDetectApacheAnt.cmake REQUIRED)
diff --git a/cmake/OpenCVAndroidProject.cmake b/cmake/OpenCVAndroidProject.cmake
index e055ecb71effd00773cadd7d422d0c5d6202e11c..8f050fe3d1b5bef31d2b95f4a76c18bf947d58de 100644
--- a/cmake/OpenCVAndroidProject.cmake
+++ b/cmake/OpenCVAndroidProject.cmake
@@ -1,147 +1,130 @@
-# creates target "${_target}_android_project" for building standard Android project
-macro(add_android_project _target _path)
- SET(android_dependencies opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core)
- if(NOT BUILD_SHARED_LIBS)
- if(BUILD_FAT_JAVA_LIB)
- SET(android_dependencies opencv_java)
- else()
- LIST(APPEND android_dependencies opencv_androidcamera)
+#add_android_project(target_name ${path} NATIVE_DEPS opencv_core LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11)
+macro(add_android_project target path)
+ # parse arguments
+ set(android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET)
+ set(__varname "android_proj_")
+ foreach(v ${android_proj_arglist})
+ set(${__varname}${v} "")
+ endforeach()
+ foreach(arg ${ARGN})
+ set(__var "${__varname}")
+ foreach(v ${android_proj_arglist})
+ if("${v}" STREQUAL "${arg}")
+ set(__varname "android_proj_${v}")
+ break()
endif()
+ endforeach()
+ if(__var STREQUAL __varname)
+ list(APPEND ${__var} "${arg}")
endif()
+ endforeach()
+
+ # get compatible SDK target
+ android_get_compatible_target(android_proj_sdk_target ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET})
+
+ if(NOT android_proj_sdk_target)
+ message(WARNING "Can not find any SDK target compatible with: ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET}
+ The project ${target} will not be build")
+ endif()
+
+ # check native dependencies
+ if(NATIVE_DEPS)
+ ocv_check_dependencies(${android_proj_NATIVE_DEPS})
+ # warn?
+ else()
+ set(OCV_DEPENDENCIES_FOUND TRUE)
+ endif()
+
+ if(OCV_DEPENDENCIES_FOUND AND android_proj_sdk_target AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13 AND EXISTS "${path}/${ANDROID_MANIFEST_FILE}")
+
+ project(${target})
+ set(android_proj_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
+
+ # get project sources
+ file(GLOB_RECURSE android_proj_files RELATIVE "${path}" "${path}/res/*" "${path}/src/*")
+ ocv_list_filterout(android_proj_files ".svn")
+
+ # copy sources out from the build tree
+ set(android_proj_file_deps "")
+ foreach(f ${android_proj_files} ${ANDROID_MANIFEST_FILE})
+ add_custom_command(
+ OUTPUT "${android_proj_bin_dir}/${f}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${path}/${f}" "${android_proj_bin_dir}/${f}"
+ MAIN_DEPENDENCY "${path}/${f}"
+ COMMENT "Copying ${f}")
+ list(APPEND android_proj_file_deps "${path}/${f}" "${android_proj_bin_dir}/${f}")
+ endforeach()
+
+ set(android_proj_lib_deps_commands "")
+ set(android_proj_target_files ${ANDROID_PROJECT_FILES})
+ ocv_list_add_prefix(android_proj_target_files "${android_proj_bin_dir}/")
+
+ # process Android library dependencies
+ foreach(dep ${android_proj_LIBRARY_DEPS})
+ file(RELATIVE_PATH __dep "${android_proj_bin_dir}" "${dep}")
+ list(APPEND android_proj_lib_deps_commands
+ COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${android_proj_bin_dir}" --library "${__dep}")
+ endforeach()
+
+ # fix Android project
+ add_custom_command(
+ OUTPUT ${android_proj_target_files}
+ COMMAND ${CMAKE_COMMAND} -E remove ${android_proj_target_files}
+ COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${android_proj_bin_dir}" --target "${android_proj_sdk_target}" --name "${target}"
+ ${android_proj_lib_deps_commands}
+ MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
+ DEPENDS "${path}/${ANDROID_MANIFEST_FILE}"
+ COMMENT "Updating Android project at ${path}. SDK target: ${android_proj_sdk_target}"
+ )
- if (ANDROID AND CAN_BUILD_ANDROID_PROJECTS)
- file(GLOB_RECURSE res_files_all RELATIVE "${_path}" "${_path}/res/*")
- file(GLOB_RECURSE jni_files_all RELATIVE "${_path}" "${_path}/jni/*.c*" "${_path}/jni/*.h*")
- file(GLOB_RECURSE src_files_all RELATIVE "${_path}" "${_path}/src/*.java")
-
- #remove .svn
- set(res_files)
- foreach(f ${res_files_all})
- if(NOT f MATCHES "\\.svn")
- list(APPEND res_files "${f}")
- endif()
- endforeach()
- set(jni_files)
- foreach(f ${jni_files_all})
- if(NOT f MATCHES "\\.svn")
- list(APPEND jni_files "${f}")
- endif()
- endforeach()
- set(src_files)
- foreach(f ${src_files_all})
- if(NOT f MATCHES "\\.svn")
- list(APPEND src_files "${f}")
- endif()
- endforeach()
-
- # get temporary location for the project
- file(RELATIVE_PATH build_path "${OpenCV_SOURCE_DIR}" "${_path}")
- SET(build_path "${CMAKE_BINARY_DIR}/${build_path}")
-
- # copy project to temporary location
- SET(${_target}_project_files)
- foreach(f ${res_files} ${src_files} "AndroidManifest.xml")
- if(NOT "${build_path}" STREQUAL "${_path}")
- #this is not needed in case of in-source build
- add_custom_command(
- OUTPUT "${build_path}/${f}"
- COMMAND ${CMAKE_COMMAND} -E copy "${_path}/${f}" "${build_path}/${f}"
- DEPENDS "${_path}/${f}"
- COMMENT ""
- )
- endif()
- list(APPEND ${_target}_project_files "${build_path}/${f}")
- endforeach()
-
- # process project.properties
- file(STRINGS "${_path}/project.properties" project_properties REGEX "^android\\.library\\.reference\\.1=.+$")
- if (project_properties)
- # has opencv dependency
- file(RELATIVE_PATH OPENCV_REFERENCE_PATH "${build_path}" "${CMAKE_BINARY_DIR}")
- add_custom_command(
- OUTPUT "${build_path}/project.properties"
- OUTPUT "${build_path}/build.xml"
- OUTPUT "${build_path}/local.properties"
- OUTPUT "${build_path}/proguard.cfg"
- COMMAND ${CMAKE_COMMAND} -E echo "" > "project.properties"
- COMMAND ${ANDROID_EXECUTABLE} update project --name "${_target}" --target "${ANDROID_SDK_TARGET}" --library "${OPENCV_REFERENCE_PATH}" --path .
- WORKING_DIRECTORY ${build_path}
- DEPENDS ${${_target}_project_files}
- DEPENDS "${CMAKE_BINARY_DIR}/project.properties"
- DEPENDS "${CMAKE_BINARY_DIR}/AndroidManifest.xml"
- COMMENT "Updating android project - ${_target}"
- )
- else()
- # has no opencv dependency
- add_custom_command(
- OUTPUT "${build_path}/project.properties"
- OUTPUT "${build_path}/build.xml"
- OUTPUT "${build_path}/local.properties"
- OUTPUT "${build_path}/proguard.cfg"
- COMMAND ${CMAKE_COMMAND} -E echo "" > "project.properties"
- COMMAND ${ANDROID_EXECUTABLE} update project --name "${_target}" --target "${ANDROID_SDK_TARGET}" --path .
- WORKING_DIRECTORY ${build_path}
- DEPENDS ${${_target}_project_files}
- COMMENT "Updating android project - ${_target}"
- )
- endif()
-
- if("${build_path}" STREQUAL "${_path}")
- #in case of in-source build project.properties file is not generated (it is just overwritten :)
- SET_SOURCE_FILES_PROPERTIES("${build_path}/project.properties" PROPERTIES GENERATED FALSE)
- endif()
-
- list(APPEND ${_target}_project_files "${build_path}/project.properties" "${build_path}/build.xml" "${build_path}/local.properties" "${build_path}/proguard.cfg")
-
- # build native part of android project
- if(jni_files)
- INCLUDE_DIRECTORIES("${_path}/jni")
-
- FILE(STRINGS "${_path}/jni/Android.mk" JNI_LIB_NAME REGEX "LOCAL_MODULE[ ]*:=[ ]*.*" )
- string(REGEX REPLACE "LOCAL_MODULE[ ]*:=[ ]*([a-zA-Z_][a-zA-Z_0-9]*)[ ]*" "\\1" JNI_LIB_NAME "${JNI_LIB_NAME}")
-
- SET(jni_sources)
- foreach(src ${jni_files})
- list(APPEND jni_sources "${_path}/${src}")
- endforeach()
-
- ADD_LIBRARY(${JNI_LIB_NAME} MODULE ${jni_sources})
- TARGET_LINK_LIBRARIES(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_dependencies})
-
- set_target_properties(${JNI_LIB_NAME} PROPERTIES
- OUTPUT_NAME "${JNI_LIB_NAME}"
- LIBRARY_OUTPUT_DIRECTORY "${build_path}/libs/${ANDROID_NDK_ABI_NAME}"
- )
+ list(APPEND android_proj_file_deps ${android_proj_target_files})
- ADD_CUSTOM_COMMAND(
- TARGET ${JNI_LIB_NAME}
- POST_BUILD
- COMMAND ${CMAKE_STRIP} --strip-unneeded "${build_path}/libs/${ANDROID_NDK_ABI_NAME}/*.so"
- )
- else()
- SET(JNI_LIB_NAME)
- endif()
-
- add_custom_command(
- OUTPUT "${build_path}/bin/${_target}-debug.apk"
- OUTPUT "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
- COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
- COMMAND ${CMAKE_COMMAND} -E copy "${build_path}/bin/${_target}-debug.apk" "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
- WORKING_DIRECTORY ${build_path}
- DEPENDS ${${_target}_project_files}
- DEPENDS "${LIBRARY_OUTPUT_PATH}/libopencv_java.so"
- COMMENT "Generating bin/${_target}.apk"
- )
+ # build native part
+ file(GLOB_RECURSE android_proj_jni_files "${path}/jni/*.c" "${path}/jni/*.h" "${path}/jni/*.cpp" "${path}/jni/*.hpp")
+ ocv_list_filterout(android_proj_jni_files ".svn")
+
+ if(android_proj_jni_files AND EXISTS ${path}/jni/Android.mk)
+ file(STRINGS "${path}/jni/Android.mk" JNI_LIB_NAME REGEX "LOCAL_MODULE[ ]*:=[ ]*.*" )
+ string(REGEX REPLACE "LOCAL_MODULE[ ]*:=[ ]*([a-zA-Z_][a-zA-Z_0-9]*)[ ]*" "\\1" JNI_LIB_NAME "${JNI_LIB_NAME}")
+
+ if(JNI_LIB_NAME)
+ ocv_include_modules_recurse(${android_proj_NATIVE_DEPS})
+ ocv_include_directories("${path}/jni")
- ADD_CUSTOM_TARGET(${_target}_android_project ALL
- DEPENDS "${build_path}/bin/${_target}-debug.apk"
- DEPENDS "${CMAKE_BINARY_DIR}/bin/${_target}.apk"
+ add_library(${JNI_LIB_NAME} MODULE ${android_proj_jni_files})
+ target_link_libraries(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_proj_NATIVE_DEPS})
+
+ set_target_properties(${JNI_LIB_NAME} PROPERTIES
+ OUTPUT_NAME "${JNI_LIB_NAME}"
+ LIBRARY_OUTPUT_DIRECTORY "${android_proj_bin_dir}/libs/${ANDROID_NDK_ABI_NAME}"
)
- add_dependencies(${_target}_android_project opencv_java ${JNI_LIB_NAME})
+ get_target_property(android_proj_jni_location "${JNI_LIB_NAME}" LOCATION)
+ add_custom_command(TARGET ${JNI_LIB_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "${android_proj_jni_location}")
+ endif()
+ else()
+ unset(JNI_LIB_NAME)
+ endif()
- if("${ARGN}" STREQUAL "INSTALL" AND INSTALL_ANDROID_EXAMPLES)
- install(FILES "${CMAKE_BINARY_DIR}/bin/${_target}.apk" DESTINATION "bin" COMPONENT main)
- endif()
+ # build java part
+ add_custom_command(
+ OUTPUT "${android_proj_bin_dir}/bin/${target}-debug.apk"
+ COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
+ COMMAND ${CMAKE_COMMAND} -E touch "${android_proj_bin_dir}/bin/${target}-debug.apk" # needed because ant does not update the timestamp of updated apk
+ WORKING_DIRECTORY "${android_proj_bin_dir}"
+ MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
+ DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar" opencv_java # as we are part of OpenCV we can just force this dependency
+ DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
+
+ add_custom_target(${target} ALL SOURCES "${android_proj_bin_dir}/bin/${target}-debug.apk" )
+ add_dependencies(${target} opencv_java ${android_proj_native_deps})
+
+ # put the final .apk to the OpenCV's bin folder
+ add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${android_proj_bin_dir}/bin/${target}-debug.apk" "${OpenCV_BINARY_DIR}/bin/${target}.apk")
+ if(INSTALL_ANDROID_EXAMPLES AND target MATCHES "^example-")
+ install(FILES "${OpenCV_BINARY_DIR}/bin/${target}.apk" DESTINATION "bin" COMPONENT main)
endif()
+ endif()
endmacro()
+
+
diff --git a/cmake/OpenCVDetectAndroidSDK.cmake b/cmake/OpenCVDetectAndroidSDK.cmake
index 4c630170a922c67a23f3ab551b351f63cfc73e7d..62dd09e6fd031906c867b1d75a2934c0dc7df4ac 100644
--- a/cmake/OpenCVDetectAndroidSDK.cmake
+++ b/cmake/OpenCVDetectAndroidSDK.cmake
@@ -85,7 +85,7 @@ if(ANDROID_EXECUTABLE)
set(ANDROID_MANIFEST_FILE AndroidManifest.xml)
set(ANDROID_LIB_PROJECT_FILES build.xml local.properties proguard-project.txt ${ANDROID_PROJECT_PROPERTIES_FILE})
- set(ANDROID_PROJECT_FILES ${ANDROID_ANT_PROPERTIES_FILE} ${ANDROID_LIB_PROJECT_FILES})
+ set(ANDROID_PROJECT_FILES ${ANDROID_LIB_PROJECT_FILES})
#get installed targets
if(ANDROID_TOOLS_Pkg_Revision GREATER 11)
@@ -120,31 +120,14 @@ if(ANDROID_EXECUTABLE)
set(ANDROID_EXECUTABLE "ANDROID_EXECUTABLE-NOTFOUND")
endif()
- # detect ANDROID_SDK_TARGET if no target is provided by user
- #TODO: remove this block
+ # clear ANDROID_SDK_TARGET if no target is provided by user
if(NOT ANDROID_SDK_TARGET)
- set(desired_android_target_level ${ANDROID_NATIVE_API_LEVEL})
- if(desired_android_target_level LESS 11)
- set(desired_android_target_level 11)
- endif()
- if(ANDROID_PROCESS EQUAL 0)
- math(EXPR desired_android_target_level_1 "${desired_android_target_level}-1")
-
- foreach(target ${ANDROID_SDK_TARGETS})
- string(REGEX MATCH "[0-9]+$" target_level "${target}")
- if(target_level GREATER desired_android_target_level_1)
- set(ANDROID_SDK_TARGET "${target}")
- break()
- endif()
- endforeach()
- else()
- set(ANDROID_SDK_TARGET android-${desired_android_target_level})
- message(WARNING "Could not retrieve list of installed Android targets. Will try to use \"${ANDROID_SDK_TARGET}\" target")
- endif()
- endif(NOT ANDROID_SDK_TARGET)
+ set(ANDROID_SDK_TARGET "" CACHE STRING "Android SDK target for the OpenCV Java API and samples")
+ endif()
+ if(ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER "2.8")
+ set_property( CACHE ANDROID_SDK_TARGET PROPERTY STRINGS ${ANDROID_SDK_TARGETS} )
+ endif()
- SET(ANDROID_SDK_TARGET "${ANDROID_SDK_TARGET}" CACHE STRING "SDK target for Android tests and samples")
- string(REGEX MATCH "[0-9]+$" ANDROID_SDK_TARGET_LEVEL "${ANDROID_SDK_TARGET}")
endif(ANDROID_EXECUTABLE)
# finds minimal installed SDK target compatible with provided names or API levels
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index c73ec32eb58e9c26c38e6a4000ef3dba4ee8d29c..65c45c6e1bb02018b3fb36c057ca34bcaede3ef5 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -355,6 +355,22 @@ macro(ocv_include_modules)
endforeach()
endmacro()
+# setup include paths for the list of passed modules and recursively add dependent modules
+macro(ocv_include_modules_recurse)
+ foreach(d ${ARGN})
+ if(d MATCHES "^opencv_" AND HAVE_${d})
+ if (EXISTS "${OPENCV_MODULE_${d}_LOCATION}/include")
+ ocv_include_directories("${OPENCV_MODULE_${d}_LOCATION}/include")
+ endif()
+ if(OPENCV_MODULE_${d}_DEPS)
+ ocv_include_modules_recurse(${OPENCV_MODULE_${d}_DEPS})
+ endif()
+ elseif(EXISTS "${d}")
+ ocv_include_directories("${d}")
+ endif()
+ endforeach()
+endmacro()
+
# setup include path for OpenCV headers for specified module
# ocv_module_include_directories(<extra include directories/extra include modules>)
macro(ocv_module_include_directories)
diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index 194568666f5ba81273b8fdcbf1f05c3089db8e5b..7568a0115da194e455c5d3dccc1324eaeec41a7f 100644
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -24,8 +24,8 @@ set(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/rst_parser.py")
set(CHECK_TEST_COVERAGE "${CMAKE_CURRENT_SOURCE_DIR}/check-tests.py")
# add dependencies to cmake (we should rerun cmake if any of these scripts is modified)
-configure_file("${GEN_JAVA}" "${CMAKE_BINARY_DIR}/junk/gen_java.junk" COPYONLY)
-configure_file("${HDR_PARSER}" "${CMAKE_BINARY_DIR}/junk/hdr_parser.junk" COPYONLY)
+configure_file("${GEN_JAVA}" "${OpenCV_BINARY_DIR}/junk/gen_java.junk" COPYONLY)
+configure_file("${HDR_PARSER}" "${OpenCV_BINARY_DIR}/junk/hdr_parser.junk" COPYONLY)
set(java_hdr_deps "")
set(generated_cpp_sources "")
@@ -53,7 +53,7 @@ foreach(module ${OPENCV_JAVA_MODULES})
# add dependencies to cmake (we should rerun cmake if any of these headers is modified)
foreach(header ${module_headers})
get_filename_component(header_name "${header}" NAME_WE)
- configure_file("${header}" "${CMAKE_BINARY_DIR}/junk/${header_name}.junk" COPYONLY)
+ configure_file("${header}" "${OpenCV_BINARY_DIR}/junk/${header_name}.junk" COPYONLY)
endforeach()
# first run (to get list of generated files)
@@ -125,17 +125,17 @@ foreach(java_file ${documented_java_files})
string(REPLACE "+" "/" java_file_name "${java_file_name}")
add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}"
- COMMAND ${CMAKE_COMMAND} -E copy "${java_file}" "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}"
+ OUTPUT "${OpenCV_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${java_file}" "${OpenCV_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}"
MAIN_DEPENDENCY "${java_file}"
DEPENDS ${java_documented_headers_deps}
COMMENT "Generating ${JAVA_OUTPUT_DIR}/${java_file_name}"
)
- list(APPEND java_files "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}")
+ list(APPEND java_files "${OpenCV_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}")
if(ANDROID)
get_filename_component(install_subdir "${java_file_name}" PATH)
- install(FILES "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" DESTINATION ${JAVA_OUTPUT_DIR}/${install_subdir} COMPONENT main)
+ install(FILES "${OpenCV_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" DESTINATION ${JAVA_OUTPUT_DIR}/${install_subdir} COMPONENT main)
endif()
endforeach()
@@ -178,10 +178,7 @@ if(ANDROID)
# force strip library after the build command
# because samples and tests will make a copy of the library before install
get_target_property(__opencv_java_location ${the_module} LOCATION)
- add_custom_command(
- TARGET ${the_module} POST_BUILD
- COMMAND ${CMAKE_STRIP} --strip-unneeded "${__opencv_java_location}"
- )
+ add_custom_command(TARGET ${the_module} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "${__opencv_java_location}")
set(lib_proj_files "")
@@ -190,16 +187,16 @@ if(ANDROID)
foreach(f ${android_lib_project_files})
if(NOT f MATCHES "\\.svn")
add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/${f}"
- COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android/${f}" "${CMAKE_BINARY_DIR}/${f}"
+ OUTPUT "${OpenCV_BINARY_DIR}/${f}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android/${f}" "${OpenCV_BINARY_DIR}/${f}"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/android/${f}"
COMMENT "Generating ${f}"
)
- list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/${f}")
+ list(APPEND lib_proj_files "${OpenCV_BINARY_DIR}/${f}")
if(NOT f MATCHES "jni/.+")
- install(FILES "${CMAKE_BINARY_DIR}/${f}" DESTINATION . COMPONENT main)
+ install(FILES "${OpenCV_BINARY_DIR}/${f}" DESTINATION . COMPONENT main)
endif()
endif()
endforeach()
@@ -208,13 +205,12 @@ if(ANDROID)
foreach(jni_file ${handwrittren_cpp_sources} ${handwrittren_h_sources} ${generated_cpp_sources})
get_filename_component(jni_file_name "${jni_file}" NAME)
add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/jni/${jni_file_name}"
- COMMAND ${CMAKE_COMMAND} -E copy "${jni_file}" "${CMAKE_BINARY_DIR}/jni/${jni_file_name}"
- COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/jni/${jni_file_name}"
+ OUTPUT "${OpenCV_BINARY_DIR}/jni/${jni_file_name}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${jni_file}" "${OpenCV_BINARY_DIR}/jni/${jni_file_name}"
DEPENDS "${jni_file}" ${java_hdr_deps}
COMMENT "Generating jni/${jni_file_name}"
)
- list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/jni/${jni_file_name}")
+ list(APPEND lib_proj_files "${OpenCV_BINARY_DIR}/jni/${jni_file_name}")
endforeach()
# create Android library project in build folder
@@ -222,32 +218,34 @@ if(ANDROID)
set(lib_target ${the_module}_android_library)
set(lib_target_files ${ANDROID_LIB_PROJECT_FILES})
- ocv_list_add_prefix(lib_target_files "${CMAKE_BINARY_DIR}/")
+ ocv_list_add_prefix(lib_target_files "${OpenCV_BINARY_DIR}/")
- android_get_compatible_target(lib_target_sdk_target 8)
+ android_get_compatible_target(lib_target_sdk_target ${ANDROID_NATIVE_API_LEVEL} ${ANDROID_SDK_TARGET})
add_custom_command(
OUTPUT ${lib_target_files}
COMMAND ${CMAKE_COMMAND} -E remove ${lib_target_files}
- COMMAND ${ANDROID_EXECUTABLE} --silent create lib-project --path \"${CMAKE_BINARY_DIR}\" --target \"${lib_target_sdk_target}\" --name OpenCV --package org.opencv 2>\"${CMAKE_CURRENT_BINARY_DIR}/create_lib_project.log\"
- MAIN_DEPENDENCY "${CMAKE_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
+ COMMAND ${ANDROID_EXECUTABLE} --silent create lib-project --path \"${OpenCV_BINARY_DIR}\" --target \"${lib_target_sdk_target}\" --name OpenCV --package org.opencv 2>\"${CMAKE_CURRENT_BINARY_DIR}/create_lib_project.log\"
+ MAIN_DEPENDENCY "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"
DEPENDS ${lib_proj_files}
COMMENT "Generating OpenCV Android library project. SDK target: ${lib_target_sdk_target}"
)
- install(FILES "${CMAKE_BINARY_DIR}/${ANDROID_PROJECT_PROPERTIES_FILE}" DESTINATION . COMPONENT main)
+ install(FILES "${OpenCV_BINARY_DIR}/${ANDROID_PROJECT_PROPERTIES_FILE}" DESTINATION . COMPONENT main)
if(ANT_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13)
# build the library project
# normally we should do this after a native part, but for a library project we can build the java part first
add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/bin/classes.jar"
+ OUTPUT "${OpenCV_BINARY_DIR}/bin/classes.jar"
COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E touch "${OpenCV_BINARY_DIR}/bin/classes.jar" # needed because ant does not update the timestamp of updated jar
+ WORKING_DIRECTORY "${OpenCV_BINARY_DIR}"
DEPENDS ${lib_proj_files} ${lib_target_files} ${java_files}
COMMENT "Building OpenCV Android library project"
)
- install(FILES "${CMAKE_BINARY_DIR}/bin/classes.jar" DESTINATION bin COMPONENT main)
- list(APPEND lib_target_files "${CMAKE_BINARY_DIR}/bin/classes.jar")
+ install(FILES "${OpenCV_BINARY_DIR}/bin/classes.jar" "${OpenCV_BINARY_DIR}/bin/jarlist.cache" "${OpenCV_BINARY_DIR}/bin/build.prop" DESTINATION bin COMPONENT main)
+ install(DIRECTORY "${OpenCV_BINARY_DIR}/bin/res" "${OpenCV_BINARY_DIR}/bin/classes" DESTINATION bin COMPONENT main)
+ list(APPEND lib_target_files "${OpenCV_BINARY_DIR}/bin/classes.jar")
endif()
add_custom_target(${lib_target}
@@ -260,14 +258,14 @@ if(ANDROID)
endif(ANDROID)
#android test project
-ocv_check_dependencies(${OPENCV_MODULE_${the_module}_OPT_DEPS})
-if(BUILD_TESTS AND OCV_DEPENDENCIES_FOUND)
- add_android_project(opencv_test_java "${CMAKE_CURRENT_SOURCE_DIR}/android_test")
-
- if(PYTHON_EXECUTABLE)
- add_custom_command(
- TARGET opencv_test_java_android_project POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} ${CHECK_TEST_COVERAGE} "${CMAKE_CURRENT_SOURCE_DIR}/android_test/src" "${CMAKE_BINARY_DIR}/src" > "${CMAKE_CURRENT_BINARY_DIR}/tests_coverage.log"
- )
- endif()
+if(ANDROID AND BUILD_TESTS)
+ add_subdirectory(android_test)
+ # add_android_project(opencv_test_java "${CMAKE_CURRENT_SOURCE_DIR}/android_test")
+
+# if(PYTHON_EXECUTABLE)
+ # add_custom_command(
+ # TARGET opencv_test_java_android_project POST_BUILD
+ # COMMAND ${PYTHON_EXECUTABLE} ${CHECK_TEST_COVERAGE} "${CMAKE_CURRENT_SOURCE_DIR}/android_test/src" "${OpenCV_BINARY_DIR}/src" > "${CMAKE_CURRENT_BINARY_DIR}/tests_coverage.log"
+ # )
+ # endif()
endif()
diff --git a/modules/java/android_test/CMakeLists.txt b/modules/java/android_test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1cfe90dbf884c724212fbc97708bc866d3601add
--- /dev/null
+++ b/modules/java/android_test/CMakeLists.txt
@@ -0,0 +1,59 @@
+ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS})
+
+if(NOT OCV_DEPENDENCIES_FOUND OR NOT ANT_EXECUTABLE OR NOT ANDROID_EXECUTABLE OR NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
+ return()
+endif()
+
+project(opencv_test_java)
+
+set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
+
+# get project sources
+file(GLOB_RECURSE opencv_test_java_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/res/*" "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
+ocv_list_filterout(opencv_test_java_files ".svn")
+
+# copy sources out from the build tree
+set(opencv_test_java_file_deps "")
+foreach(f ${opencv_test_java_files} ${ANDROID_MANIFEST_FILE})
+ add_custom_command(
+ OUTPUT "${opencv_test_java_bin_dir}/${f}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${opencv_test_java_bin_dir}/${f}"
+ MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${f}"
+ COMMENT "Copying ${f}")
+ list(APPEND opencv_test_java_file_deps "${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${opencv_test_java_bin_dir}/${f}")
+endforeach()
+
+# fix Android project
+set(android_proj_target_files ${ANDROID_PROJECT_FILES})
+ocv_list_add_prefix(android_proj_target_files "${opencv_test_java_bin_dir}/")
+file(RELATIVE_PATH __dep "${opencv_test_java_bin_dir}" "${OpenCV_BINARY_DIR}")
+
+add_custom_command(
+ OUTPUT ${android_proj_target_files}
+ COMMAND ${CMAKE_COMMAND} -E remove ${android_proj_target_files}
+ COMMAND ${ANDROID_EXECUTABLE} --silent update test-project --path "${opencv_test_java_bin_dir}" --main "${OpenCV_BINARY_DIR}"
+ COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${opencv_test_java_bin_dir}" --library "${__dep}"
+ MAIN_DEPENDENCY "${opencv_test_java_bin_dir}/${ANDROID_MANIFEST_FILE}"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}"
+ COMMENT "Updating Android Java API test project")
+
+list(APPEND opencv_test_java_file_deps ${android_proj_target_files})
+
+# build java part
+add_custom_command(
+ OUTPUT "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk"
+ COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
+ COMMAND ${CMAKE_COMMAND} -E touch "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" # needed because ant does not update the timestamp of updated apk
+ WORKING_DIRECTORY "${opencv_test_java_bin_dir}"
+ MAIN_DEPENDENCY "${opencv_test_java_bin_dir}/${ANDROID_MANIFEST_FILE}"
+ DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar" opencv_java
+ DEPENDS ${opencv_test_java_file_deps})
+
+add_custom_target(${PROJECT_NAME} ALL SOURCES "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" )
+add_dependencies(${PROJECT_NAME} opencv_java)
+
+# put the final .apk to the OpenCV's bin folder
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" "${OpenCV_BINARY_DIR}/bin/${PROJECT_NAME}.apk")
+
+add_dependencies(opencv_tests ${PROJECT_NAME})
+
diff --git a/modules/java/android_test/default.properties b/modules/java/android_test/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/modules/java/android_test/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/modules/java/android_test/project.properties b/modules/java/android_test/project.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/modules/java/android_test/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/15-puzzle/CMakeLists.txt b/samples/android/15-puzzle/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..447931955429e653e68bb34b24e56bb1aa7ca5ca
--- /dev/null
+++ b/samples/android/15-puzzle/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-15-puzzle)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/15-puzzle/default.properties b/samples/android/15-puzzle/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/15-puzzle/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/15-puzzle/project.properties b/samples/android/15-puzzle/project.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/15-puzzle/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index dad752947fb2b44b8fa1883931addc4d7947bfa0..7999c3a9a5867bf6efb63d73e648fb6ebe430012 100644
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -2,30 +2,22 @@
# CMake file for Android samples. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
-SET(OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core)
+add_custom_target(opencv_android_examples)
-ocv_check_dependencies(${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS} opencv_java)
+add_subdirectory(15-puzzle)
+add_subdirectory(face-detection)
+add_subdirectory(image-manipulations)
+add_subdirectory(tutorial-0-androidcamera)
+add_subdirectory(tutorial-1-addopencv)
+add_subdirectory(tutorial-2-opencvcamera)
+add_subdirectory(tutorial-3-native)
+add_subdirectory(tutorial-4-mixed)
-if(BUILD_ANDROID_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
- project(android_samples)
-
- ocv_include_modules(${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS})
-
- file(GLOB android_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
- list(REMOVE_ITEM android_samples hello-android)
- list(SORT android_samples)
-
- foreach(sample ${android_samples})
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml")
- add_android_project("${sample}" "${CMAKE_CURRENT_SOURCE_DIR}/${sample}" INSTALL)
- endif()
- endforeach()
-
- #hello-android sample
- ADD_EXECUTABLE(hello-android hello-android/main.cpp)
- TARGET_LINK_LIBRARIES(hello-android ${OPENCV_LINKER_LIBS} ${OPENCV_ANDROID_SAMPLES_REQUIRED_DEPS})
+#hello-android sample
+if(HAVE_opencv_highgui)
+ ocv_include_modules_recurse(opencv_highgui opencv_core)
+ add_executable(hello-android hello-android/main.cpp)
+ target_link_libraries(hello-android ${OPENCV_LINKER_LIBS} opencv_highgui opencv_core)
set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
- if(INSTALL_ANDROID_EXAMPLES)
- install(TARGETS hello-android DESTINATION bin COMPONENT main)
- endif()
+ add_dependencies(opencv_android_examples hello-android)
endif()
diff --git a/samples/android/face-detection/CMakeLists.txt b/samples/android/face-detection/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3f3234905a126bdc7fe54629a092d7316955189d
--- /dev/null
+++ b/samples/android/face-detection/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-face-detection)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/face-detection/default.properties b/samples/android/face-detection/default.properties
deleted file mode 100644
index 74bb01ac065dde0993a71bc0727a5d209554b3fa..0000000000000000000000000000000000000000
--- a/samples/android/face-detection/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../OpenCV-2.3.1
-# Project target.
-target=android-8
diff --git a/samples/android/face-detection/project.properties b/samples/android/face-detection/project.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/face-detection/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/image-manipulations/CMakeLists.txt b/samples/android/image-manipulations/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..70adb1dbe1e9d4b7e37d8c9a9e397386439d5407
--- /dev/null
+++ b/samples/android/image-manipulations/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-image-manipulations)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/image-manipulations/default.properties b/samples/android/image-manipulations/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/image-manipulations/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/image-manipulations/project.properties b/samples/android/image-manipulations/project.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/image-manipulations/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-0-androidcamera/CMakeLists.txt b/samples/android/tutorial-0-androidcamera/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5c5780aca9f1544a5021e0b0b4eca58a06f2c7fa
--- /dev/null
+++ b/samples/android/tutorial-0-androidcamera/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(sample example-tutorial-0-androidcamera)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
+
diff --git a/samples/android/tutorial-0-androidcamera/default.properties b/samples/android/tutorial-0-androidcamera/default.properties
deleted file mode 100644
index 32299c258a5fcd4eeb33f79cd7fe47c6cd587444..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-0-androidcamera/default.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-0-androidcamera/project.properties b/samples/android/tutorial-0-androidcamera/project.properties
deleted file mode 100644
index 65d68fd3953e2e03107ca226c11ac9a001888f32..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-0-androidcamera/project.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project target.
-target=android-11
diff --git a/samples/android/tutorial-1-addopencv/CMakeLists.txt b/samples/android/tutorial-1-addopencv/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..eb5bc79826c28bc332db347bb064b92196660578
--- /dev/null
+++ b/samples/android/tutorial-1-addopencv/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(sample example-tutorial-1-addopencv)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
+
diff --git a/samples/android/tutorial-1-addopencv/default.properties b/samples/android/tutorial-1-addopencv/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-1-addopencv/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-1-addopencv/project.properties b/samples/android/tutorial-1-addopencv/project.properties
deleted file mode 100644
index 25192ad88d4b99bd022a3f2c5b15f338338dfbc7..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-1-addopencv/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-11
diff --git a/samples/android/tutorial-2-opencvcamera/CMakeLists.txt b/samples/android/tutorial-2-opencvcamera/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..685f870b6fe85d1c473d2a6db676f3264a17d5c7
--- /dev/null
+++ b/samples/android/tutorial-2-opencvcamera/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(sample example-tutorial-2-opencvcamera)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
+
diff --git a/samples/android/tutorial-2-opencvcamera/default.properties b/samples/android/tutorial-2-opencvcamera/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-2-opencvcamera/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-2-opencvcamera/project.properties b/samples/android/tutorial-2-opencvcamera/project.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-2-opencvcamera/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-3-native/CMakeLists.txt b/samples/android/tutorial-3-native/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6b790e4560ed801b5988788e6555c9f7f16da438
--- /dev/null
+++ b/samples/android/tutorial-3-native/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-tutorial-3-native)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS opencv_features2d)
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/tutorial-3-native/default.properties b/samples/android/tutorial-3-native/default.properties
deleted file mode 100644
index 32299c258a5fcd4eeb33f79cd7fe47c6cd587444..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-3-native/default.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-3-native/project.properties b/samples/android/tutorial-3-native/project.properties
deleted file mode 100644
index 65d68fd3953e2e03107ca226c11ac9a001888f32..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-3-native/project.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project target.
-target=android-11
diff --git a/samples/android/tutorial-4-mixed/CMakeLists.txt b/samples/android/tutorial-4-mixed/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2fac5843bb4ba7922312848d22443f16b1615d6d
--- /dev/null
+++ b/samples/android/tutorial-4-mixed/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(sample example-tutorial-4-mixed)
+
+if(BUILD_FAT_JAVA_LIB)
+ set(native_deps opencv_java)
+else()
+ set(native_deps opencv_features2d)
+endif()
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS ${native_deps})
+if(TARGET ${sample})
+ add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/tutorial-4-mixed/default.properties b/samples/android/tutorial-4-mixed/default.properties
deleted file mode 100644
index fb3ea1f7b34c41e85d4a6bf81241ba67c9890502..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-4-mixed/default.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-8
diff --git a/samples/android/tutorial-4-mixed/project.properties b/samples/android/tutorial-4-mixed/project.properties
deleted file mode 100644
index 25192ad88d4b99bd022a3f2c5b15f338338dfbc7..0000000000000000000000000000000000000000
--- a/samples/android/tutorial-4-mixed/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library.reference.1=../../../android/build
-# Project target.
-target=android-11