Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.

2013-12-19 10:27:38 +04:00
parent 442082eb0f
commit 6da7c50fb5
5 changed files with 8 additions and 18 deletions
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -33,7 +33,11 @@ macro(ocv_glob_module_sources_no_cuda)
                                 SOURCES ${lib_srcs} ${lib_int_hdrs} ${cuda_objs} ${lib_cuda_hdrs})
 endmacro()

-ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES})
+if (DYNAMIC_CUDA_SUPPORT)
+  ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES})
+else()
+  ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
+endif()
 ocv_module_include_directories(${ZLIB_INCLUDE_DIR})

 if(HAVE_WINRT)