diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-09 14:26:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-09 14:26:51 (GMT) |
| commit | 5fbfa18fadf945963687cd95627c1bc62b68948a (patch) | |
| tree | d783c04dca36b46409baf33a1a4944b945a04b31 /Modules/FindCUDA.cmake | |
| parent | bc88329e5ba7b1a14538f23f4fa223ac8d6d5895 (diff) | |
| parent | ff41a4b817749be1e51ebb6ab15bab6f0e488139 (diff) | |
| download | CMake-5fbfa18fadf945963687cd95627c1bc62b68948a.zip CMake-5fbfa18fadf945963687cd95627c1bc62b68948a.tar.gz CMake-5fbfa18fadf945963687cd95627c1bc62b68948a.tar.bz2 | |
Merge topic 'FindCUDA-deduplicate-c+std-host-flags'
ff41a4b8 FindCUDA: de-duplicates C++11 flag when propagating host flags.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1628
Diffstat (limited to 'Modules/FindCUDA.cmake')
| -rw-r--r-- | Modules/FindCUDA.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 2199edb..9176db4 100644 --- a/Modules/FindCUDA.cmake +++ b/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}") |