exclude opencv_contrib modules

pull/16673/head
Alexander Alekhin 5 years ago
parent f163778da7
commit 84bb67e49b
  1. 7
      cmake/OpenCVPackaging.cmake
  2. 44
      include/opencv2/opencv.hpp
  3. 2
      modules/core/include/opencv2/core/persistence.hpp

@ -123,10 +123,9 @@ endif()
set(STD_OPENCV_LIBS opencv-data) set(STD_OPENCV_LIBS opencv-data)
set(STD_OPENCV_DEV libopencv-dev) set(STD_OPENCV_DEV libopencv-dev)
foreach(module calib3d core cudaarithm cudabgsegm cudacodec cudafeatures2d cudafilters foreach(module calib3d core dnn features2d flann gapi highgui
cudaimgproc cudalegacy cudaobjdetect cudaoptflow cudastereo cudawarping imgcodecs imgproc ml objdetect
cudev features2d flann hal highgui imgcodecs imgproc ml objdetect ocl photo stitching ts video videoio)
photo shape stitching superres ts video videoio videostab viz)
if(HAVE_opencv_${module}) if(HAVE_opencv_${module})
list(APPEND STD_OPENCV_LIBS "libopencv-${module}4.0") list(APPEND STD_OPENCV_LIBS "libopencv-${module}4.0")
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev") list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")

@ -82,58 +82,14 @@
#ifdef HAVE_OPENCV_PHOTO #ifdef HAVE_OPENCV_PHOTO
#include "opencv2/photo.hpp" #include "opencv2/photo.hpp"
#endif #endif
#ifdef HAVE_OPENCV_SHAPE
#include "opencv2/shape.hpp"
#endif
#ifdef HAVE_OPENCV_STITCHING #ifdef HAVE_OPENCV_STITCHING
#include "opencv2/stitching.hpp" #include "opencv2/stitching.hpp"
#endif #endif
#ifdef HAVE_OPENCV_SUPERRES
#include "opencv2/superres.hpp"
#endif
#ifdef HAVE_OPENCV_VIDEO #ifdef HAVE_OPENCV_VIDEO
#include "opencv2/video.hpp" #include "opencv2/video.hpp"
#endif #endif
#ifdef HAVE_OPENCV_VIDEOIO #ifdef HAVE_OPENCV_VIDEOIO
#include "opencv2/videoio.hpp" #include "opencv2/videoio.hpp"
#endif #endif
#ifdef HAVE_OPENCV_VIDEOSTAB
#include "opencv2/videostab.hpp"
#endif
#ifdef HAVE_OPENCV_VIZ
#include "opencv2/viz.hpp"
#endif
// Finally CUDA specific entries are checked and added
#ifdef HAVE_OPENCV_CUDAARITHM
#include "opencv2/cudaarithm.hpp"
#endif
#ifdef HAVE_OPENCV_CUDABGSEGM
#include "opencv2/cudabgsegm.hpp"
#endif
#ifdef HAVE_OPENCV_CUDACODEC
#include "opencv2/cudacodec.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAFEATURES2D
#include "opencv2/cudafeatures2d.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAFILTERS
#include "opencv2/cudafilters.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAIMGPROC
#include "opencv2/cudaimgproc.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAOBJDETECT
#include "opencv2/cudaobjdetect.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAOPTFLOW
#include "opencv2/cudaoptflow.hpp"
#endif
#ifdef HAVE_OPENCV_CUDASTEREO
#include "opencv2/cudastereo.hpp"
#endif
#ifdef HAVE_OPENCV_CUDAWARPING
#include "opencv2/cudawarping.hpp"
#endif
#endif #endif

@ -124,7 +124,7 @@ streams.
Here is an example: Here is an example:
@code @code
#include "opencv2/opencv.hpp" #include "opencv2/core.hpp"
#include <time.h> #include <time.h>
using namespace cv; using namespace cv;

Loading…
Cancel
Save