Skip to content

O
opencv
Commit 00b72df6 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Merge pull request #4147 from alalek:fix_world_cyclic_deps

parents 4c1cbffd c8167c0b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/stitching/CMakeLists.txt
View file @ 00b72df6
...@@ -4,6 +4,10 @@ if(HAVE_CUDA) ...@@ -4,6 +4,10 @@ if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow)
endif() endif()
set(STITCHING_CONTRIB_DEPS "opencv_xfeatures2d")
if(BUILD_SHARED_LIBS AND BUILD_opencv_world)
set(STITCHING_CONTRIB_DEPS "")
endif()
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_cudalegacy opencv_xfeatures2d OPTIONAL opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_cudalegacy ${STITCHING_CONTRIB_DEPS}
WRAP python) WRAP python)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment