Changed java tests detection procedure

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4afe3e..b8b560c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1043,7 +1043,8 @@ 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 (CAN_BUILD_ANDROID_PROJECTS OR HAVE_opencv_java)            THEN YES ELSE NO)
+status("    Java wrappers:" HAVE_opencv_java                                                            THEN YES ELSE NO)
+status("    Java tests:"    BUILD_TESTS AND opencv_test_java_BINARY_DIR                                                 THEN YES ELSE NO)
 
 # ========================= matlab =========================
 status("")

diff --git a/modules/java/android_test/CMakeLists.txt b/modules/java/android_test/CMakeLists.txt
index 7a55b8a..8b1b24b 100644 (file)
--- a/modules/java/android_test/CMakeLists.txt
+++ b/modules/java/android_test/CMakeLists.txt
@@ -1,4 +1,10 @@
-ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS})
+# list of modules covered with tests
+set(tested_modules opencv_calib3d opencv_core opencv_features2d opencv_highgui opencv_imgproc opencv_objdetect opencv_photo opencv_video opencv_android)
+
+# opencv_ml is broken
+#list(APPEND tested_modules opencv_ml)
+
+ocv_check_dependencies(opencv_java ${tested_modules})
 
 if(NOT OCV_DEPENDENCIES_FOUND OR NOT ANT_EXECUTABLE OR NOT ANDROID_EXECUTABLE OR NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
   return()

diff --git a/modules/java/test/CMakeLists.txt b/modules/java/test/CMakeLists.txt
index 4a40ce2..4f1b422 100644 (file)
--- a/modules/java/test/CMakeLists.txt
+++ b/modules/java/test/CMakeLists.txt
@@ -1,4 +1,10 @@
-ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS})
+# list of modules covered with tests
+set(tested_modules opencv_calib3d opencv_core opencv_features2d opencv_highgui opencv_imgproc opencv_objdetect opencv_photo opencv_video)
+
+# opencv_ml is broken
+#list(APPEND tested_modules opencv_ml)
+
+ocv_check_dependencies(opencv_java ${tested_modules})
 
 if(NOT OCV_DEPENDENCIES_FOUND)
   return()