CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.

This commit is contained in:
Alexander Smorkalov
2013-12-27 11:18:10 +04:00
parent 41fd711ab0
commit c48777a1c3
7 changed files with 16 additions and 9 deletions

View File

@@ -70,7 +70,9 @@ if(ANDROID)
endif()
# GPU module enabled separately
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "gpu")
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "opencv_gpu")
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE "opencv_dynamicuda")
if(HAVE_opencv_gpu)
set(OPENCV_HAVE_GPU_MODULE_CONFIGMAKE "on")
endif()