generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Android build with SDK revision 14

Browse Source
This commit is contained in:
Andrey Kamaev
2011-10-21 08:35:34 +00:00
parent 177618984d
commit e8032fa8e9
11 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/java/CMakeLists.txt
View File

@@ -214,7 +214,17 @@ if(ANDROID)
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/res"
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/gen"
DEPENDS ${lib_proj_files}
)
)
if (ANT_EXECUTABLE AND ANDROID_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13)
add_custom_command(
TARGET ${target}
COMMAND ${ANDROID_EXECUTABLE} update lib-project --path "${CMAKE_BINARY_DIR}"
COMMAND ${ANT_EXECUTABLE} debug
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
DEPENDS ${lib_target}
)
endif()
add_dependencies(${lib_target} ${api_target})
add_dependencies(${target} ${lib_target})