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

New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2

Browse Source
This commit is contained in:
Maksim Shabunin
2015-11-11 16:12:35 +03:00
parent b4112a5878
commit e8bf4417ef
11 changed files with 158 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/android_test/CMakeLists.txt
View File

@@ -50,7 +50,7 @@ get_filename_component(java_name "${java_location}" NAME)
add_custom_command(
OUTPUT "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${java_location}" "${opencv_test_java_bin_dir}/libs/${ANDROID_NDK_ABI_NAME}/${java_name}"
COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug -Djava.target=1.6 -Djava.source=1.6
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}"