mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17526 from cyyever:fix_cuda_detection

Browse Source
This commit is contained in:
Alexander Alekhin 2020-06-20 21:07:05 +00:00
commit 5ed65460d1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/OpenCVDetectCUDA.cmake
View File

@ -106,12 +106,17 @@ if(CUDA_FOUND)
unset(CUDA_ARCH_PTX CACHE) unset(CUDA_ARCH_PTX CACHE)
endif() endif()
SET(DETECT_ARCHS_COMMAND "${CUDA_NVCC_EXECUTABLE}" ${CUDA_NVCC_FLAGS} "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run") if(CUDA_HOST_COMPILER)
if(WIN32 AND CMAKE_LINKER) #Workaround for VS cl.exe not being in the env. path LIST(APPEND CUDA_NVCC_FLAGS -ccbin ${CUDA_HOST_COMPILER})
get_filename_component(host_compiler_bindir ${CMAKE_LINKER} DIRECTORY) else()
SET(DETECT_ARCHS_COMMAND ${DETECT_ARCHS_COMMAND} "-ccbin" "${host_compiler_bindir}") if(WIN32 AND CMAKE_LINKER) #Workaround for VS cl.exe not being in the env. path
get_filename_component(host_compiler_bindir ${CMAKE_LINKER} DIRECTORY)
LIST(APPEND CUDA_NVCC_FLAGS -ccbin ${host_compiler_bindir})
endif()
endif() endif()
SET(DETECT_ARCHS_COMMAND "${CUDA_NVCC_EXECUTABLE}" ${CUDA_NVCC_FLAGS} "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run")
macro(ocv_filter_available_architecture result_list) macro(ocv_filter_available_architecture result_list)
if(DEFINED CUDA_SUPPORTED_CC) if(DEFINED CUDA_SUPPORTED_CC)
set(${result_list} "${CUDA_SUPPORTED_CC}") set(${result_list} "${CUDA_SUPPORTED_CC}")