turn on CUDA part of nonfree module on Android for non-dynamic build

2014-02-03 11:52:43 +04:00
parent 2bef73c968
commit d8f7377122
7 changed files with 13 additions and 19 deletions
--- a/modules/nonfree/perf/perf_gpu.cpp
+++ b/modules/nonfree/perf/perf_gpu.cpp
@@ -42,7 +42,9 @@

 #include "perf_precomp.hpp"

-#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
+#include "cvconfig.h"
+
+#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA) && !defined(DYNAMIC_CUDA_SUPPORT)

 #include "opencv2/ts/gpu_perf.hpp"