summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-12 13:13:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-05-12 13:13:19 (GMT)
commit592206a157a57da031cd44d86269a92cfb17a736 (patch)
tree4026389779f027a41cc8a215c01f19301485c3a1 /Source
parent040de18b36cddba470684e73f3a6bdcaa28474bd (diff)
parent036ffe815acd1ea4ee5cafb1b9547930bfbdbebf (diff)
downloadCMake-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
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalGenerator.cxx1
1 files changed, 1 insertions, 0 deletions
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");
}