fix cyclic deps error (world,shared)
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 22 Jun 2015 17:14:30 +0000 (20:14 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 22 Jun 2015 17:14:30 +0000 (20:14 +0300)
modules/stitching/CMakeLists.txt

index 9a24f43..76c7bc8 100644 (file)
@@ -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)