nonfree module fixes

2013-04-18 10:10:55 +04:00
parent 5d7bbdc837
commit 12f16b7a26
11 changed files with 31 additions and 44 deletions
--- a/modules/nonfree/perf/perf_precomp.hpp
+++ b/modules/nonfree/perf/perf_precomp.hpp
@@ -19,9 +19,8 @@
 #  include "opencv2/nonfree/ocl.hpp"
 #endif

-#ifdef HAVE_OPENCV_GPU
-    #include "opencv2/nonfree/gpu.hpp"
-    #include "opencv2/ts/gpu_perf.hpp"
+#ifdef HAVE_CUDA
+#  include "opencv2/nonfree/gpu.hpp"
 #endif

 #ifdef GTEST_CREATE_SHARED_LIBRARY