From 35b671efb536f63fdc55e0d75aef5b7e6d8724fa Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Thu, 13 Sep 2012 12:17:35 +0400
Subject: [PATCH] disabled utility code in gpu tests when WITH_CUDA=false

---
 modules/gpu/test/main_test_nvidia.h |  2 --
 modules/gpu/test/test_nvidia.cpp    |  4 ++--
 modules/gpu/test/test_precomp.hpp   | 30 ++++++++++++++---------------
 modules/gpu/test/utility.cpp        |  4 ++++
 modules/gpu/test/utility.hpp        |  8 --------
 5 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/modules/gpu/test/main_test_nvidia.h b/modules/gpu/test/main_test_nvidia.h
index 15016ca64..173cbdbce 100644
--- 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 3de355744..9c49b099b 100644
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@@ -41,13 +41,13 @@
 
 #include "test_precomp.hpp"
 
-OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
-
 #ifdef HAVE_CUDA
 
 using namespace cvtest;
 using namespace testing;
 
+OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
+
 struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo>
 {
     cv::gpu::DeviceInfo devInfo;
diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp
index 782b06ad6..21967b94a 100644
--- a/modules/gpu/test/test_precomp.hpp
+++ b/modules/gpu/test/test_precomp.hpp
@@ -61,24 +61,24 @@
 
 #include "cvconfig.h"
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/video/video.hpp"
-#include "opencv2/ts/ts.hpp"
-#include "opencv2/ts/ts_perf.hpp"
-#include "opencv2/gpu/gpu.hpp"
-#include "opencv2/nonfree/nonfree.hpp"
-#include "opencv2/legacy/legacy.hpp"
-
-#include "utility.hpp"
-#include "interpolation.hpp"
-#include "main_test_nvidia.h"
-
 #ifdef HAVE_CUDA
     #include <cuda.h>
     #include <cuda_runtime.h>
+
+    #include "opencv2/core/core.hpp"
+    #include "opencv2/highgui/highgui.hpp"
+    #include "opencv2/calib3d/calib3d.hpp"
+    #include "opencv2/imgproc/imgproc.hpp"
+    #include "opencv2/video/video.hpp"
+    #include "opencv2/ts/ts.hpp"
+    #include "opencv2/ts/ts_perf.hpp"
+    #include "opencv2/gpu/gpu.hpp"
+    #include "opencv2/nonfree/nonfree.hpp"
+    #include "opencv2/legacy/legacy.hpp"
+
+    #include "utility.hpp"
+    #include "interpolation.hpp"
+    #include "main_test_nvidia.h"
 #endif
 
 #endif
diff --git a/modules/gpu/test/utility.cpp b/modules/gpu/test/utility.cpp
index a92d2c52f..df09bce6c 100644
--- a/modules/gpu/test/utility.cpp
+++ b/modules/gpu/test/utility.cpp
@@ -41,6 +41,8 @@
 
 #include "test_precomp.hpp"
 
+#ifdef HAVE_CUDA
+
 using namespace std;
 using namespace cv;
 using namespace cv::gpu;
@@ -418,3 +420,5 @@ void showDiff(InputArray gold_, InputArray actual_, double eps)
 
     waitKey();
 }
+
+#endif // HAVE_CUDA
diff --git a/modules/gpu/test/utility.hpp b/modules/gpu/test/utility.hpp
index 1d153fcf0..54034e110 100644
--- a/modules/gpu/test/utility.hpp
+++ b/modules/gpu/test/utility.hpp
@@ -42,14 +42,6 @@
 #ifndef __OPENCV_TEST_UTILITY_HPP__
 #define __OPENCV_TEST_UTILITY_HPP__
 
-#include <vector>
-#include <string>
-#include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/gpu/gpu.hpp"
-#include "opencv2/ts/ts.hpp"
-#include "opencv2/ts/ts_perf.hpp"
-
 //////////////////////////////////////////////////////////////////////
 // random generators