added CUDA_DISABLER preprocessor commands

2012-10-01 22:37:20 +04:00
parent 46874d40df
commit 55b1d7c097
112 changed files with 376 additions and 81 deletions
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@@ -41,13 +41,15 @@

 #include "test_precomp.hpp"

-#ifdef HAVE_CUDA
+#if defined HAVE_CUDA
+  OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
+#endif
+
+#if defined HAVE_CUDA && !defined(CUDA_DISABLER)

 using namespace cvtest;
 using namespace testing;

-OutputLevel nvidiaTestOutputLevel = OutputLevelCompact;
-
 struct NVidiaTest : TestWithParam<cv::gpu::DeviceInfo>
 {
    cv::gpu::DeviceInfo devInfo;