mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27142 from asmorkalov:as/cuda_standard_all

Browse Source 
Set C++ standard for all CUDA configurations
This commit is contained in:
Alexander Smorkalov 2025-03-26 08:53:16 +03:00 committed by GitHub
commit 8e2826ddd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/OpenCVDetectCUDA.cmake
View File

@ -152,14 +152,15 @@ macro(ocv_cuda_compile VAR)
ocv_nvcc_flags() ocv_nvcc_flags()
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")
if(CUDA_VERSION VERSION_LESS "11.0") # Windows version does not support --std option
if(UNIX OR APPLE)
list(APPEND CUDA_NVCC_FLAGS "--std=c++11") list(APPEND CUDA_NVCC_FLAGS "--std=c++11")
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()
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() endif()