mirror of
https://github.com/opencv/opencv.git
synced 2025-06-13 13:13:26 +08:00
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
This commit is contained in:
parent
88419f8923
commit
adc516becc
@ -231,7 +231,16 @@ foreach(__opttype OPT DBG)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
|
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES})
|
||||||
|
|
||||||
|
if(${CUDA_VERSION} VERSION_LESS "5.5")
|
||||||
|
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_npp_LIBRARY})
|
||||||
|
else()
|
||||||
|
find_cuda_helper_libs(nppc)
|
||||||
|
find_cuda_helper_libs(nppi)
|
||||||
|
find_cuda_helper_libs(npps)
|
||||||
|
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nppc_LIBRARY} ${CUDA_nppi_LIBRARY} ${CUDA_npps_LIBRARY})
|
||||||
|
endif()
|
||||||
|
|
||||||
if(OpenCV_USE_CUBLAS)
|
if(OpenCV_USE_CUBLAS)
|
||||||
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUBLAS_LIBRARIES})
|
list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUBLAS_LIBRARIES})
|
||||||
|
Loading…
Reference in New Issue
Block a user