Revert "Merge pull request #836 from jet47:gpu-modules"

This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.

modules/nonfree/perf/perf_gpu.cpp

@@ -42,7 +42,7 @@
 
 #include "perf_precomp.hpp"
 
-#ifdef HAVE_CUDA
+#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
 
 #include "opencv2/ts/gpu_perf.hpp"
 
@@ -65,8 +65,6 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // SURF
 
-#ifdef HAVE_OPENCV_GPUARITHM
-
 DEF_PARAM_TEST_1(Image, string);
 
 PERF_TEST_P(Image, GPU_SURF,
@@ -110,8 +108,6 @@ PERF_TEST_P(Image, GPU_SURF,
     }
 }
 
-#endif // HAVE_OPENCV_GPUARITHM
-
 //////////////////////////////////////////////////////
 // VIBE
 
@@ -181,6 +177,6 @@ PERF_TEST_P(Video_Cn, GPU_VIBE,
     }
 }
 
-#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT
+#endif
 
-#endif // HAVE_CUDA
+#endif

modules/nonfree/perf/perf_precomp.hpp

@@ -19,8 +19,9 @@
 #  include "opencv2/nonfree/ocl.hpp"
 #endif
 
-#ifdef HAVE_CUDA
-#  include "opencv2/nonfree/gpu.hpp"
+#ifdef HAVE_OPENCV_GPU
+    #include "opencv2/nonfree/gpu.hpp"
+    #include "opencv2/ts/gpu_perf.hpp"
 #endif
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY