Skip to content

Commit 84bb67e

Browse files
committed
exclude opencv_contrib modules
1 parent f163778 commit 84bb67e

File tree

3 files changed

+4
-49
lines changed

3 files changed

+4
-49
lines changed

cmake/OpenCVPackaging.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,9 @@ endif()
123123
set(STD_OPENCV_LIBS opencv-data)
124124
set(STD_OPENCV_DEV libopencv-dev)
125125

126-
foreach(module calib3d core cudaarithm cudabgsegm cudacodec cudafeatures2d cudafilters
127-
cudaimgproc cudalegacy cudaobjdetect cudaoptflow cudastereo cudawarping
128-
cudev features2d flann hal highgui imgcodecs imgproc ml objdetect ocl
129-
photo shape stitching superres ts video videoio videostab viz)
126+
foreach(module calib3d core dnn features2d flann gapi highgui
127+
imgcodecs imgproc ml objdetect
128+
photo stitching ts video videoio)
130129
if(HAVE_opencv_${module})
131130
list(APPEND STD_OPENCV_LIBS "libopencv-${module}4.0")
132131
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")

include/opencv2/opencv.hpp

-44
Original file line numberDiff line numberDiff line change
@@ -82,58 +82,14 @@
8282
#ifdef HAVE_OPENCV_PHOTO
8383
#include "opencv2/photo.hpp"
8484
#endif
85-
#ifdef HAVE_OPENCV_SHAPE
86-
#include "opencv2/shape.hpp"
87-
#endif
8885
#ifdef HAVE_OPENCV_STITCHING
8986
#include "opencv2/stitching.hpp"
9087
#endif
91-
#ifdef HAVE_OPENCV_SUPERRES
92-
#include "opencv2/superres.hpp"
93-
#endif
9488
#ifdef HAVE_OPENCV_VIDEO
9589
#include "opencv2/video.hpp"
9690
#endif
9791
#ifdef HAVE_OPENCV_VIDEOIO
9892
#include "opencv2/videoio.hpp"
9993
#endif
100-
#ifdef HAVE_OPENCV_VIDEOSTAB
101-
#include "opencv2/videostab.hpp"
102-
#endif
103-
#ifdef HAVE_OPENCV_VIZ
104-
#include "opencv2/viz.hpp"
105-
#endif
106-
107-
// Finally CUDA specific entries are checked and added
108-
#ifdef HAVE_OPENCV_CUDAARITHM
109-
#include "opencv2/cudaarithm.hpp"
110-
#endif
111-
#ifdef HAVE_OPENCV_CUDABGSEGM
112-
#include "opencv2/cudabgsegm.hpp"
113-
#endif
114-
#ifdef HAVE_OPENCV_CUDACODEC
115-
#include "opencv2/cudacodec.hpp"
116-
#endif
117-
#ifdef HAVE_OPENCV_CUDAFEATURES2D
118-
#include "opencv2/cudafeatures2d.hpp"
119-
#endif
120-
#ifdef HAVE_OPENCV_CUDAFILTERS
121-
#include "opencv2/cudafilters.hpp"
122-
#endif
123-
#ifdef HAVE_OPENCV_CUDAIMGPROC
124-
#include "opencv2/cudaimgproc.hpp"
125-
#endif
126-
#ifdef HAVE_OPENCV_CUDAOBJDETECT
127-
#include "opencv2/cudaobjdetect.hpp"
128-
#endif
129-
#ifdef HAVE_OPENCV_CUDAOPTFLOW
130-
#include "opencv2/cudaoptflow.hpp"
131-
#endif
132-
#ifdef HAVE_OPENCV_CUDASTEREO
133-
#include "opencv2/cudastereo.hpp"
134-
#endif
135-
#ifdef HAVE_OPENCV_CUDAWARPING
136-
#include "opencv2/cudawarping.hpp"
137-
#endif
13894

13995
#endif

modules/core/include/opencv2/core/persistence.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ streams.
124124
125125
Here is an example:
126126
@code
127-
#include "opencv2/opencv.hpp"
127+
#include "opencv2/core.hpp"
128128
#include <time.h>
129129
130130
using namespace cv;

0 commit comments

Comments
 (0)