diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-11 11:44:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-11 11:45:29 (GMT) |
| commit | 01fb8d7993f2ebcc47ce8ecab1aa5144a4ca4b80 (patch) | |
| tree | 2acd0b2d4da8b987988ee3150bd539a580c4f9ae /Modules | |
| parent | 61ad9d92bd20d5d3725066bbda36f70ae040b58b (diff) | |
| parent | 95700be52d860aa4f4e5b4c7562c9bb97acb4b2a (diff) | |
| download | CMake-01fb8d7993f2ebcc47ce8ecab1aa5144a4ca4b80.zip CMake-01fb8d7993f2ebcc47ce8ecab1aa5144a4ca4b80.tar.gz CMake-01fb8d7993f2ebcc47ce8ecab1aa5144a4ca4b80.tar.bz2 | |
Merge topic 'nvcc_supports_cuda17' into release-3.18
95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4872
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index 87607e2..feb5ecc 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -78,6 +78,12 @@ if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CUDA14_STANDARD_COMPILE_OPTION "") set(CMAKE_CUDA14_EXTENSION_COMPILE_OPTION "") endif() + + if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) + set(CMAKE_CUDA17_STANDARD_COMPILE_OPTION "") + set(CMAKE_CUDA17_EXTENSION_COMPILE_OPTION "") + endif() + else() set(CMAKE_CUDA03_STANDARD_COMPILE_OPTION "") set(CMAKE_CUDA03_EXTENSION_COMPILE_OPTION "") @@ -92,6 +98,11 @@ else() set(CMAKE_CUDA14_EXTENSION_COMPILE_OPTION "-std=c++14") endif() + if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) + set(CMAKE_CUDA17_STANDARD_COMPILE_OPTION "-std=c++17") + set(CMAKE_CUDA17_EXTENSION_COMPILE_OPTION "-std=c++17") + endif() + endif() # FIXME: investigate use of --options-file. |