turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit d8f7377122)

2014-02-03 11:52:43 +04:00
parent f6367a2ea5
commit f15a167df4
7 changed files with 13 additions and 19 deletions
--- a/modules/nonfree/test/test_gpu.cpp
+++ b/modules/nonfree/test/test_gpu.cpp
@@ -42,7 +42,9 @@

 #include "test_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)

 using namespace cvtest;