Merge pull request #2551 from ilya-lavrenov:ocl_nonfree

11 years ago · 97eac3f394
parent bb3c0c066c 7df92bbb77
commit 97eac3f394
1 changed files with 3 additions and 1 deletions
--- a/modules/nonfree/perf/perf_main.cpp
+++ b/modules/nonfree/perf/perf_main.cpp
@ -31,7 +31,9 @@ static const char * impls[] = {
 int main(int argc, char **argv)
 {
    ::perf::TestBase::setPerformanceStrategy(::perf::PERF_STRATEGY_SIMPLE);
-#if defined(HAVE_CUDA)
+#if defined(HAVE_CUDA) && defined(HAVE_OPENCL)
+    CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, perf::printCudaInfo(), dumpOpenCLDevice());
+#elif defined(HAVE_CUDA)
    CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, perf::printCudaInfo());
 #elif defined(HAVE_OPENCL)
    CV_PERF_TEST_MAIN_INTERNALS(nonfree, impls, dumpOpenCLDevice());