diff --git a/Modules/Internal/CMakeCUDAArchitecturesAll.cmake b/Modules/Internal/CMakeCUDAArchitecturesAll.cmake
index e0fdb67e0b..c588dfb8d1 100644
--- a/Modules/Internal/CMakeCUDAArchitecturesAll.cmake
+++ b/Modules/Internal/CMakeCUDAArchitecturesAll.cmake
@@ -55,13 +55,17 @@ function(cmake_cuda_architectures_all lang lang_var_)
   endif()
 
   if(${lang_var_}TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.4)
-    if(CMAKE_${lang}_COMPILER_ID STREQUAL "NVIDIA")
+    if(CMAKE_${lang}_COMPILER_ID STREQUAL "NVIDIA"
+        OR (CMAKE_${lang}_COMPILER_ID STREQUAL "Clang" AND CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
+        )
       list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 87)
     endif()
   endif()
 
   if(${lang_var_}TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.8)
-    if(CMAKE_${lang}_COMPILER_ID STREQUAL "NVIDIA")
+    if(CMAKE_${lang}_COMPILER_ID STREQUAL "NVIDIA"
+        OR (CMAKE_${lang}_COMPILER_ID STREQUAL "Clang" AND CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
+        )
       list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 89 90)
       list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 90)
     endif()