Fixed incorrectly merged patch.

2012-02-09 20:22:36 +00:00
parent 3ef5bfa185
commit 68a54e7f3c
4 changed files with 21 additions and 6 deletions
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -210,8 +210,7 @@ if(APPLE)
    endif()
 endif(APPLE)

-set(OPENCV_MODULE_ANDROIDCAMERA "ON") #TODO: fix it
-if(HAVE_opencv_androidcamera AND OPENCV_MODULE_ANDROIDCAMERA)
+if(HAVE_opencv_androidcamera)
  set(highgui_srcs ${highgui_srcs} src/cap_android.cpp)
  add_definitions(-DHAVE_ANDROID_NATIVE_CAMERA)#TODO: remove this line
 endif()