Merge pull request #2551 from ilya-lavrenov:ocl_nonfree

97eac3f3 · Andrey Pavlenko · OpenCV Buildbot · bb3c0c06 · 7df92bbb · 97eac3f3
Commit 97eac3f3 authored Mar 31, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Mar 31, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

perf_main.cpp modules/nonfree/perf/perf_main.cpp +3 -1

No files found.
--- 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());