disabled utility code in gpu tests when WITH_CUDA=false

diff --git a/modules/gpu/test/main_test_nvidia.h b/modules/gpu/test/main_test_nvidia.h
index 15016ca..173cbdb 100644 (file)
--- a/modules/gpu/test/main_test_nvidia.h
+++ b/modules/gpu/test/main_test_nvidia.h
@@ -1,8 +1,6 @@
 #ifndef __main_test_nvidia_h__
 #define __main_test_nvidia_h__
 
-#include <string>
-
 enum OutputLevel
 {
     OutputLevelNone,

diff --git a/modules/gpu/test/test_nvidia.cpp b/modules/gpu/test/test_nvidia.cpp
index 3de3557..9c49b09 100644 (file)
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@@ -41,13 +41,13 @@
 \r
 #include "test_precomp.hpp"\r
 \r
-OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;\r
-\r
 #ifdef HAVE_CUDA\r
 \r
 using namespace cvtest;\r
 using namespace testing;\r
 \r
+OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;\r
+\r
 struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo>\r
 {\r
     cv::gpu::DeviceInfo devInfo;\r

diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp
index 782b06a..21967b9 100644 (file)
--- a/modules/gpu/test/test_precomp.hpp
+++ b/modules/gpu/test/test_precomp.hpp
@@ -61,24 +61,24 @@
 \r
 #include "cvconfig.h"\r
 \r
-#include "opencv2/core/core.hpp"\r
-#include "opencv2/highgui/highgui.hpp"\r
-#include "opencv2/calib3d/calib3d.hpp"\r
-#include "opencv2/imgproc/imgproc.hpp"\r
-#include "opencv2/video/video.hpp"\r
-#include "opencv2/ts/ts.hpp"\r
-#include "opencv2/ts/ts_perf.hpp"\r
-#include "opencv2/gpu/gpu.hpp"\r
-#include "opencv2/nonfree/nonfree.hpp"\r
-#include "opencv2/legacy/legacy.hpp"\r
-\r
-#include "utility.hpp"\r
-#include "interpolation.hpp"\r
-#include "main_test_nvidia.h"\r
-\r
 #ifdef HAVE_CUDA\r
     #include <cuda.h>\r
     #include <cuda_runtime.h>\r
+\r
+    #include "opencv2/core/core.hpp"\r
+    #include "opencv2/highgui/highgui.hpp"\r
+    #include "opencv2/calib3d/calib3d.hpp"\r
+    #include "opencv2/imgproc/imgproc.hpp"\r
+    #include "opencv2/video/video.hpp"\r
+    #include "opencv2/ts/ts.hpp"\r
+    #include "opencv2/ts/ts_perf.hpp"\r
+    #include "opencv2/gpu/gpu.hpp"\r
+    #include "opencv2/nonfree/nonfree.hpp"\r
+    #include "opencv2/legacy/legacy.hpp"\r
+\r
+    #include "utility.hpp"\r
+    #include "interpolation.hpp"\r
+    #include "main_test_nvidia.h"\r
 #endif\r
 \r
 #endif\r

diff --git a/modules/gpu/test/utility.cpp b/modules/gpu/test/utility.cpp
index a92d2c5..df09bce 100644 (file)
--- a/modules/gpu/test/utility.cpp
+++ b/modules/gpu/test/utility.cpp
@@ -41,6 +41,8 @@
 \r
 #include "test_precomp.hpp"\r
 \r
+#ifdef HAVE_CUDA\r
+\r
 using namespace std;\r
 using namespace cv;\r
 using namespace cv::gpu;\r
@@ -418,3 +420,5 @@ void showDiff(InputArray gold_, InputArray actual_, double eps)
 \r
     waitKey();\r
 }\r
+\r
+#endif // HAVE_CUDA\r

diff --git a/modules/gpu/test/utility.hpp b/modules/gpu/test/utility.hpp
index 1d153fc..54034e1 100644 (file)
--- a/modules/gpu/test/utility.hpp
+++ b/modules/gpu/test/utility.hpp
@@ -42,14 +42,6 @@
 #ifndef __OPENCV_TEST_UTILITY_HPP__\r
 #define __OPENCV_TEST_UTILITY_HPP__\r
 \r
-#include <vector>\r
-#include <string>\r
-#include "opencv2/core/core.hpp"\r
-#include "opencv2/highgui/highgui.hpp"\r
-#include "opencv2/gpu/gpu.hpp"\r
-#include "opencv2/ts/ts.hpp"\r
-#include "opencv2/ts/ts_perf.hpp"\r
-\r
 //////////////////////////////////////////////////////////////////////\r
 // random generators\r
 \r