Просмотр исходного кода

Merge topic 'FindCUDA-deduplicate-c+std-host-flags'

ff41a4b8 FindCUDA: de-duplicates C++11 flag when propagating host flags.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1628
Brad King 8 лет назад
Родитель
Сommit
5fbfa18fad
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      Modules/FindCUDA.cmake

+ 1 - 1
Modules/FindCUDA.cmake

@@ -1448,7 +1448,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
   if( "${_cuda_host_flags}" MATCHES "-std=c\\+\\+11")
     # Add the c++11 flag to nvcc if it isn't already present.  Note that we only look at
     # the main flag instead of the configuration specific flags.
-    if( NOT "${CUDA_NVCC_FLAGS}" MATCHES "-std;c\\+\\+11" )
+    if( NOT "${CUDA_NVCC_FLAGS}" MATCHES "-std=c\\+\\+11" )
       list(APPEND nvcc_flags --std c++11)
     endif()
     string(REGEX REPLACE "[-]+std=c\\+\\+11" "" _cuda_host_flags "${_cuda_host_flags}")