[Cmake-commits] CMake branch, next, updated. v3.6.1-1334-ga19d6dc

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a19d6dc8f66ca81b9e9e8b0ca329ec04ff6879d2 (commit)
       via  2dc9a754b539bb215ad2360a27327a629ad26627 (commit)
      from  ef255b495f0258451eb53ba6f6525f58a4b5f60b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a19d6dc8f66ca81b9e9e8b0ca329ec04ff6879d2
commit a19d6dc8f66ca81b9e9e8b0ca329ec04ff6879d2
Merge: ef255b4 2dc9a75
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 23 10:48:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 23 10:48:04 2016 -0400

    Merge topic 'FindCUDA-fix-arch-regex' into next
    
    2dc9a754 FindCUDA: Support `2.1(2.0)` architecture notation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dc9a754b539bb215ad2360a27327a629ad26627
commit 2dc9a754b539bb215ad2360a27327a629ad26627
Author:     Boris Fomitchev <bfomitchev at nvidia.com>
AuthorDate: Thu Aug 18 12:00:42 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 23 10:47:27 2016 -0400

    FindCUDA: Support `2.1(2.0)` architecture notation
    
    Also tweak some messages and comments.

diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake
index d516831..5ce71a9 100644
--- a/Modules/FindCUDA/select_compute_arch.cmake
+++ b/Modules/FindCUDA/select_compute_arch.cmake
@@ -102,7 +102,7 @@ function(CUDA_SELECT_NVCC_ARCH_FLAGS out_variable)
     set(CUDA_ARCH_LIST ${CUDA_COMMON_GPU_ARCHITECTURES})
   elseif("${CUDA_ARCH_LIST}" STREQUAL "Auto")
     CUDA_DETECT_INSTALLED_GPUS(CUDA_ARCH_LIST)
-    message(STATUS "Autodetected CUDA architecture(s): ${cuda_arch_bin}")
+    message(STATUS "Autodetected CUDA architecture(s): ${CUDA_ARCH_LIST}")
   endif()
 
   # Now process the list and look for names
@@ -116,7 +116,7 @@ function(CUDA_SELECT_NVCC_ARCH_FLAGS out_variable)
       set(add_ptx TRUE)
       set(arch_name ${CMAKE_MATCH_1})
     endif()
-    if(arch_name MATCHES "([0-9]\\.[0-9])$")
+    if(arch_name MATCHES "^([0-9]\\.[0-9](\\([0-9]\\.[0-9]\\))?)$")
       set(arch_bin ${CMAKE_MATCH_1})
       set(arch_ptx ${arch_bin})
     else()
@@ -173,11 +173,11 @@ function(CUDA_SELECT_NVCC_ARCH_FLAGS out_variable)
   # Tell NVCC to add binaries for the specified GPUs
   foreach(arch ${cuda_arch_bin})
     if(arch MATCHES "([0-9]+)\\(([0-9]+)\\)")
-      # User explicitly specified PTX for the concrete BIN
+      # User explicitly specified ARCH for the concrete CODE
       list(APPEND nvcc_flags -gencode arch=compute_${CMAKE_MATCH_2},code=sm_${CMAKE_MATCH_1})
       list(APPEND nvcc_archs_readable sm_${CMAKE_MATCH_1})
     else()
-      # User didn't explicitly specify PTX for the concrete BIN, we assume PTX=BIN
+      # User didn't explicitly specify ARCH for the concrete CODE, we assume ARCH=CODE
       list(APPEND nvcc_flags -gencode arch=compute_${arch},code=sm_${arch})
       list(APPEND nvcc_archs_readable sm_${arch})
     endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA/select_compute_arch.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake