Merge pull request #4147 from alalek:fix_world_cyclic_deps

opencv · Jul 14, 2015 · 00b72df · 00b72df
2 parents 4c1cbff + c8167c0
commit 00b72df
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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)