diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-27 16:14:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-27 16:14:08 (GMT) |
| commit | d282ca55b8219b04dd03ff1d7125ce65a671ec07 (patch) | |
| tree | 990035e97c705cfc16c7d7ac5338d2bdf6e6f895 | |
| parent | 93daefc90539261df7de3c14108db83e2abb202e (diff) | |
| parent | f590ea506affd4b7181ed8672efd4b9ec9fb31a9 (diff) | |
| download | CMake-d282ca55b8219b04dd03ff1d7125ce65a671ec07.zip CMake-d282ca55b8219b04dd03ff1d7125ce65a671ec07.tar.gz CMake-d282ca55b8219b04dd03ff1d7125ce65a671ec07.tar.bz2 | |
Merge topic 'findcuda_quotes'
f590ea506a FindCUDA: Make version extraction robust to empty output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6908
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index dd795f4..af5f798 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -926,8 +926,8 @@ mark_as_advanced(CUDA_NVCC_EXECUTABLE) if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION) # Compute the version. execute_process (COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT) - string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT}) - string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT}) + string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR "${NVCC_OUT}") + string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR "${NVCC_OUT}") set(CUDA_VERSION "${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" CACHE STRING "Version of CUDA as computed from nvcc.") mark_as_advanced(CUDA_VERSION) else() |