mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'add_cuda_cxx14_flag'

Browse Source 
036ffe81 CUDA: Add support for the C++14 standard flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
This commit is contained in:
Brad King
2017-05-12 13:13:16 +00:00
committed by Kitware Robot
parent 040de18b36 036ffe815a
commit 592206a157
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Compiler/NVIDIA-CUDA.cmake
View File

@@ -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()

1
Source/cmLocalGenerator.cxx
View File

@@ -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");
}