|
|
|
@ -402,7 +402,7 @@ if(ANDROID) |
|
|
|
|
if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13) |
|
|
|
|
message(WARNING "OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled.") |
|
|
|
|
endif() |
|
|
|
|
elseif(ANT_EXECUTABLE) |
|
|
|
|
else() |
|
|
|
|
find_package(JNI) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
@ -830,7 +830,7 @@ status(" ant:" ANT_EXECUTABLE THEN "${ANT_EXECUTABLE} (ver ${A |
|
|
|
|
if(NOT ANDROID) |
|
|
|
|
status(" JNI:" JNI_INCLUDE_DIRS THEN "${JNI_INCLUDE_DIRS}" ELSE NO) |
|
|
|
|
endif() |
|
|
|
|
status(" Java tests:" BUILD_TESTS AND (NOT ANDROID OR CAN_BUILD_ANDROID_PROJECTS) THEN YES ELSE NO) |
|
|
|
|
status(" Java tests:" BUILD_TESTS AND (CAN_BUILD_ANDROID_PROJECTS OR HAVE_opencv_java) THEN YES ELSE NO) |
|
|
|
|
|
|
|
|
|
# ========================== documentation ========================== |
|
|
|
|
if(BUILD_DOCS) |
|
|
|
|