summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-09-20 13:35:45 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-09-20 13:36:31 (GMT)
commit22db0d5c6e45d3ce247c2ebe5e5c54810363486f (patch)
tree12070bc0ccc3c405130ed27b31c345742166c1ad
parent99648081085d8ec48a7846c918bee39a2bdde908 (diff)
parentbfd93b73a03a6b2c1e8bb298f7085f90c30337c1 (diff)
downloadCMake-22db0d5c6e45d3ce247c2ebe5e5c54810363486f.zip
CMake-22db0d5c6e45d3ce247c2ebe5e5c54810363486f.tar.gz
CMake-22db0d5c6e45d3ce247c2ebe5e5c54810363486f.tar.bz2
Merge topic 'FindCUDA-filter-compute-capabilities'
bfd93b73a0 FindCUDA: Filter unrelated content in compute capabilities output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2400
-rw-r--r--Modules/FindCUDA/select_compute_arch.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake
index cf4fc39..1baf051 100644
--- a/Modules/FindCUDA/select_compute_arch.cmake
+++ b/Modules/FindCUDA/select_compute_arch.cmake
@@ -109,6 +109,9 @@ function(CUDA_DETECT_INSTALLED_GPUS OUT_VARIABLE)
RUN_OUTPUT_VARIABLE compute_capabilities)
endif()
+ # Filter unrelated content out of the output.
+ string(REGEX MATCHALL "[0-9]+\\.[0-9]+" compute_capabilities "${compute_capabilities}")
+
if(run_result EQUAL 0)
string(REPLACE "2.1" "2.1(2.0)" compute_capabilities "${compute_capabilities}")
set(CUDA_GPU_DETECT_OUTPUT ${compute_capabilities}