Fixed android test detection and some spaces in CMakeLists.txt

10 years ago · 2992e3a1b6
parent cff5e3ee88
commit 2992e3a1b6
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1044,7 +1044,7 @@ if(NOT ANDROID)
  status("    JNI:"         JNI_INCLUDE_DIRS    THEN "${JNI_INCLUDE_DIRS}"                                       ELSE NO)
 endif()
 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)
+status("    Java tests:"    BUILD_TESTS AND opencv_test_java_BINARY_DIR                                 THEN YES ELSE NO)

 # ========================= matlab =========================
 status("")
--- a/modules/java/android_test/CMakeLists.txt
+++ b/modules/java/android_test/CMakeLists.txt
@ -1,5 +1,5 @@
 # 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)
+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)