diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake index 06998400d7..c5ce8762f2 100644 --- a/cmake/OpenCVDetectCUDA.cmake +++ b/cmake/OpenCVDetectCUDA.cmake @@ -151,12 +151,14 @@ macro(ocv_cuda_compile VAR) ocv_check_windows_crt_linkage() ocv_nvcc_flags() - if(UNIX OR APPLE) - if(NOT " ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG} ${CUDA_NVCC_FLAGS}" MATCHES "-std=") + if(NOT " ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG} ${CUDA_NVCC_FLAGS}" MATCHES "-std=") + if(UNIX OR APPLE) if(CUDA_VERSION VERSION_LESS "11.0") list(APPEND CUDA_NVCC_FLAGS "--std=c++11") - else() + elseif(CUDA_VERSION VERSION_LESS "12.8") list(APPEND CUDA_NVCC_FLAGS "--std=c++14") + elseif(CUDA_VERSION VERSION_GREATER_EQUAL "12.8") + list(APPEND CUDA_NVCC_FLAGS "--std=c++17") endif() endif() endif() diff --git a/cmake/OpenCVDetectCUDALanguage.cmake b/cmake/OpenCVDetectCUDALanguage.cmake index 0eeea77f2c..bc40134180 100644 --- a/cmake/OpenCVDetectCUDALanguage.cmake +++ b/cmake/OpenCVDetectCUDALanguage.cmake @@ -33,10 +33,12 @@ if(CMAKE_CUDA_COMPILER AND CUDAToolkit_FOUND) set(CUDA_TOOLKIT_INCLUDE ${CUDAToolkit_INCLUDE_DIRS}) set(CUDA_VERSION_STRING ${CUDAToolkit_VERSION}) set(CUDA_VERSION ${CUDAToolkit_VERSION}) - if(NOT CUDA_VERSION VERSION_LESS 11.0) + if(CUDA_VERSION VERSION_LESS 11.0) + set(CMAKE_CUDA_STANDARD 11) + elseif(CUDA_VERSION VERSION_LESS 12.8) set(CMAKE_CUDA_STANDARD 14) else() - set(CMAKE_CUDA_STANDARD 11) + set(CMAKE_CUDA_STANDARD 17) endif() if(UNIX AND NOT BUILD_SHARED_LIBS) set(CUDA_LIB_EXT "_static")