From 68a595d88bb79e3ba9f8df5ac98f7da5794d5676 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 25 Mar 2025 07:57:03 +0300 Subject: [PATCH] Set C++ standard for all CUDA configurations. --- cmake/OpenCVDetectCUDA.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake index c5ce8762f2..c2179da804 100644 --- a/cmake/OpenCVDetectCUDA.cmake +++ b/cmake/OpenCVDetectCUDA.cmake @@ -152,14 +152,15 @@ macro(ocv_cuda_compile VAR) ocv_nvcc_flags() 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") - 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() + 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()