From 8f732f2cfe0cc28473340134ccb1db32868ccd9a Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 11 Dec 2015 15:29:08 +0300 Subject: [PATCH] fix samples deps some tutorials depends on contrib modules --- cmake/templates/OpenCVConfig.cmake.in | 1 + samples/cpp/CMakeLists.txt | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index ee57ecd..80ffbaf 100644 --- a/cmake/templates/OpenCVConfig.cmake.in +++ b/cmake/templates/OpenCVConfig.cmake.in @@ -159,6 +159,7 @@ SET(OpenCV_VERSION_STATUS "@OPENCV_VERSION_STATUS@") # ==================================================================== SET(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@) +list(REMOVE_ITEM OpenCV_LIB_COMPONENTS opencv_hal) SET(OpenCV_WORLD_COMPONENTS @OPENCV_WORLD_MODULES@) # ============================================================== diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index ff5caa9..b7de23e 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -6,7 +6,7 @@ SET(OPENCV_CPP_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_flann opencv_imgcodecs opencv_videoio opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_photo opencv_features2d opencv_calib3d - opencv_stitching opencv_videostab opencv_shape) + opencv_stitching opencv_videostab opencv_shape ${OPENCV_MODULES_BUILD} ${OpenCV_LIB_COMPONENTS}) ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) @@ -30,14 +30,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudafilters/include") endif() - if (HAVE_opencv_xfeatures2d) - ocv_include_directories("${OPENCV_MODULE_opencv_xfeatures2d_LOCATION}/include") - endif() - - if(HAVE_opencv_ocl) - ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/ocl/include") - endif() - if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") endif() -- 2.7.4