potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

made flann dependency for features2d optional

Browse Source 
it will allow to build features2d even if flann module is not available
This commit is contained in:
Vladislav Vinogradov
2017-10-13 11:01:48 +03:00
parent 1ba29cc95d
commit 26fe8bd4f2
8 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/CMakeLists.txt
+1 -1
View File
@@ -8,6 +8,6 @@ set(STITCHING_CONTRIB_DEPS "opencv_xfeatures2d")
if(BUILD_SHARED_LIBS AND BUILD_opencv_world AND OPENCV_WORLD_EXCLUDE_EXTRA_MODULES)
set(STITCHING_CONTRIB_DEPS "")
endif()
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_flann
OPTIONAL opencv_cudaarithm opencv_cudawarping opencv_cudafeatures2d opencv_cudalegacy ${STITCHING_CONTRIB_DEPS}
WRAP python)