From c8167c0b999071ddaebf99dbfd36a11af8cf8150 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 22 Jun 2015 20:14:30 +0300 Subject: [PATCH] fix cyclic deps error (world,shared) --- modules/stitching/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt index 9a24f43160..76c7bc8489 100644 --- 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)