Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert

7efb09fb · Roman Donchenko · OpenCV Buildbot · ae897879 · 3b65b710 · 7efb09fb
Commit 7efb09fb authored Mar 24, 2014 by Roman Donchenko Committed by OpenCV Buildbot Mar 24, 2014
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

CMakeLists.txt CMakeLists.txt +10 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,6 +512,16 @@ if(NOT HAVE_CUDA)
  set(ENABLE_DYNAMIC_CUDA OFF)
 endif()
+if(HAVE_CUDA AND NOT ENABLE_DYNAMIC_CUDA)
+  set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
+  if(HAVE_CUBLAS)
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_cublas_LIBRARY})
+  endif()
+  if(HAVE_CUFFT)
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_cufft_LIBRARY})
+  endif()
+endif()
 # ----------------------------------------------------------------------------
 # Solution folders:
 # ----------------------------------------------------------------------------