summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-05-18 16:28:41 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-05-18 16:29:44 (GMT)
commitb246dee7db2e7e6fcd2a00c5b2bd6db21045025f (patch)
tree7d6c9310a65d91c49e7223de20f8df274ca93e0d /Help
parent4acf31d681ff25543a5d7615521a75ebe368fb24 (diff)
parenta653ca9504569eb45077ee598945b18a3c9e4ee8 (diff)
downloadCMake-b246dee7db2e7e6fcd2a00c5b2bd6db21045025f.zip
CMake-b246dee7db2e7e6fcd2a00c5b2bd6db21045025f.tar.gz
CMake-b246dee7db2e7e6fcd2a00c5b2bd6db21045025f.tar.bz2
Merge topic 'cuda-clang'
a653ca9504 Tests: Update CUDA tests to work with Clang 5df21adf46 CUDA: Add support for Clang compiler dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file 70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artem Belevich <tra@google.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: friendnick <ikoval67@gmail.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4442
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/CUDA_STANDARD.rst2
-rw-r--r--Help/release/dev/cuda-clang.rst4
2 files changed, 5 insertions, 1 deletions
diff --git a/Help/prop_tgt/CUDA_STANDARD.rst b/Help/prop_tgt/CUDA_STANDARD.rst
index a3a2f56..6d6774e 100644
--- a/Help/prop_tgt/CUDA_STANDARD.rst
+++ b/Help/prop_tgt/CUDA_STANDARD.rst
@@ -7,7 +7,7 @@ This property specifies the CUDA/C++ standard whose features are requested
to build this target. For some compilers, this results in adding a
flag such as ``-std=gnu++11`` to the compile line.
-Supported values are ``98``, ``11``, ``14``.
+Supported values are ``98``, ``03``, ``11``, ``14``, ``17``, ``20``.
If the value requested does not result in a compile flag being added for
the compiler in use, a previous standard flag will be added instead. This
diff --git a/Help/release/dev/cuda-clang.rst b/Help/release/dev/cuda-clang.rst
new file mode 100644
index 0000000..fa5cd5a
--- /dev/null
+++ b/Help/release/dev/cuda-clang.rst
@@ -0,0 +1,4 @@
+cuda-clang
+----------
+
+* The ``CUDA`` language now supports Clang as a compiler.