generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Smorkalov
2013-12-19 10:27:38 +04:00
parent 442082eb0f
commit 6da7c50fb5
5 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/CMakeLists.txt
View File

@@ -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)

3
modules/gpu/CMakeLists.txt
View File

@@ -3,7 +3,8 @@ if(IOS)
endif()
set(the_description "GPU-accelerated Computer Vision")
ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video opencv_photo opencv_legacy)
ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video opencv_photo opencv_legacy
OPTIONAL ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_cufft_LIBRARY})
ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")

2
modules/superres/CMakeLists.txt
View File

@@ -4,4 +4,4 @@ endif()
set(the_description "Super Resolution")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
ocv_define_module(superres opencv_imgproc opencv_video OPTIONAL opencv_gpu opencv_highgui opencv_ocl)
ocv_define_module(superres opencv_imgproc opencv_video OPTIONAL opencv_gpu opencv_highgui opencv_ocl ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})