1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-22 07:31:26 +08:00

Merge pull request #75 from StevenPuttemans/fix_build_includes

fixing build with extra modules
This commit is contained in:
Vadim Pisarevsky
2014-08-27 14:14:52 +04:00
2 changed files with 4 additions and 4 deletions

View File

@@ -18,11 +18,11 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp" # include "opencv2/ocl.hpp"
#endif #endif
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
# include "opencv2/nonfree/cuda.hpp" # include "opencv2/xfeatures2d/cuda.hpp"
#endif #endif
#ifdef GTEST_CREATE_SHARED_LIBRARY #ifdef GTEST_CREATE_SHARED_LIBRARY

View File

@@ -22,11 +22,11 @@
#include "cvconfig.h" #include "cvconfig.h"
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
# include "opencv2/nonfree/ocl.hpp" # include "opencv2/ocl.hpp"
#endif #endif
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
# include "opencv2/nonfree/cuda.hpp" # include "opencv2/xfeatures2d/cuda.hpp"
#endif #endif
#endif #endif