Merge pull request #75 from StevenPuttemans/fix_build_includes

fixing build with extra modules

Author: vpisarev

modules/xfeatures2d/perf/perf_precomp.hpp

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

modules/xfeatures2d/test/test_precomp.hpp

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