Skip to content

O
opencv_contrib
Commit 1ce15227 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #75 from StevenPuttemans/fix_build_includes 

fixing build with extra modules
parents e4cfe59a e7d9d119
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/xfeatures2d/perf/perf_precomp.hpp
View file @ 1ce15227
...@@ -18,11 +18,11 @@ ...@@ -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
......
modules/xfeatures2d/test/test_precomp.hpp
View file @ 1ce15227
...@@ -22,11 +22,11 @@ ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment