fix cyclic deps error (world,shared)

c8167c0b · Alexander Alekhin · 945aa06f · c8167c0b
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

modules/stitching/CMakeLists.txt modules/stitching/CMakeLists.txt +5 -1

未找到文件。
--- a/modules/stitching/CMakeLists.txt
+++ b/modules/stitching/CMakeLists.txt
@@ -4,6 +4,10 @@ if(HAVE_CUDA)
  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow)
 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
-                  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)