Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps

11 years ago · 28ecd54f58
parent bfdbc9cefd 09f0e1777e
commit 28ecd54f58
2 changed files with 14 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -456,6 +456,18 @@ if(WITH_OPENCL)
  include(cmake/OpenCVDetectOpenCL.cmake)
 endif()
 # ----------------------------------------------------------------------------
 # Add CUDA libraries (needed for apps/tools, samples)
 # ----------------------------------------------------------------------------
 if(HAVE_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:
 # ----------------------------------------------------------------------------
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@ -1,2 +1,4 @@
 link_libraries(${OPENCV_LINKER_LIBS})
 add_subdirectory(haartraining)
 add_subdirectory(traincascade)