diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-12 13:13:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-12 13:13:19 (GMT) |
| commit | 592206a157a57da031cd44d86269a92cfb17a736 (patch) | |
| tree | 4026389779f027a41cc8a215c01f19301485c3a1 | |
| parent | 040de18b36cddba470684e73f3a6bdcaa28474bd (diff) | |
| parent | 036ffe815acd1ea4ee5cafb1b9547930bfbdbebf (diff) | |
| download | CMake-592206a157a57da031cd44d86269a92cfb17a736.zip CMake-592206a157a57da031cd44d86269a92cfb17a736.tar.gz CMake-592206a157a57da031cd44d86269a92cfb17a736.tar.bz2 | |
Merge topic 'add_cuda_cxx14_flag'
036ffe81 CUDA: Add support for the C++14 standard flag.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 6 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index 316cab8..785e269 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -24,4 +24,10 @@ else() set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "") set(CMAKE_CUDA11_STANDARD_COMPILE_OPTION "-std=c++11") set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11") + + if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 9.0) + set(CMAKE_CUDA14_STANDARD_COMPILE_OPTION "-std=c++14") + set(CMAKE_CUDA14_EXTENSION_COMPILE_OPTION "-std=c++14") + endif() + endif() diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index f584753..307024a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1537,6 +1537,7 @@ void cmLocalGenerator::AddCompilerRequirementFlag( langStdMap["C"].push_back("99"); langStdMap["C"].push_back("90"); + langStdMap["CUDA"].push_back("14"); langStdMap["CUDA"].push_back("11"); langStdMap["CUDA"].push_back("98"); } |