Fixed android test detection and some spaces in CMakeLists.txt

This commit is contained in:
Maksim Shabunin 2014-09-19 13:10:14 +04:00
parent cff5e3ee88
commit 2992e3a1b6
2 changed files with 2 additions and 2 deletions

View File

@ -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("")

View File

@ -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)