Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed android test detection and some spaces in CMakeLists.txt

Browse Source
pull/3237/head
Maksim Shabunin 10 years ago
parent cff5e3ee88
commit 2992e3a1b6
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 2
      modules/java/android_test/CMakeLists.txt

2
CMakeLists.txt
Unescape View File

@ -1044,7 +1044,7 @@ if(NOT ANDROID)
status(" JNI:" JNI_INCLUDE_DIRS THEN "${JNI_INCLUDE_DIRS}" ELSE NO) status(" JNI:" JNI_INCLUDE_DIRS THEN "${JNI_INCLUDE_DIRS}" ELSE NO)
endif() endif()
status(" Java wrappers:" 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) status(" Java tests:" BUILD_TESTS AND opencv_test_java_BINARY_DIR THEN YES ELSE NO)
# ========================= matlab ========================= # ========================= matlab =========================
status("") status("")

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

@ -1,5 +1,5 @@
# list of modules covered with tests # 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 # opencv_ml is broken
#list(APPEND tested_modules opencv_ml) #list(APPEND tested_modules opencv_ml)

Write Preview
Loading…
Cancel
Save