diff options
| author | Raul Tambre <raul@tambre.ee> | 2020-06-18 20:03:25 +0300 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-18 15:07:31 -0400 |
| commit | d9c1f05924239fafc159ed0b24ecdc24228c8e34 (patch) | |
| tree | 24ec6d3caed4ceaf64486b5cfc1ea052549ec327 | |
| parent | c26853718ec764d02e243bb6bfdabf0f9ec3157c (diff) | |
| download | cmake-d9c1f05924239fafc159ed0b24ecdc24228c8e34.tar.gz | |
CUDA: Fix NVCC executable search during compiler detection
The result variable was `CUDAToolkit_NVCC_EXECUTABLE` instead of
`_CUDA_NVCC_EXECUTABLE`, which the rest of the code used. Also, we can
simply `set()` the `_CUDA_NVCC_EXECUTABLE` value without searching.
Fixes: #20847
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index e12da45872..335305e7a2 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -76,13 +76,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) # For NVCC we can easily deduce the SDK binary directory from the compiler path. if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") - get_filename_component(_CUDA_BIN_DIR "${CMAKE_CUDA_COMPILER}" DIRECTORY) - find_program(CUDAToolkit_NVCC_EXECUTABLE - NAMES nvcc nvcc.exe - PATHS ${_CUDA_BIN_DIR} - NO_DEFAULT_PATH - ) - unset(_CUDA_BIN_DIR) + set(_CUDA_NVCC_EXECUTABLE "${CMAKE_CUDA_COMPILER}") endif() # Search using CUDAToolkit_ROOT and then CUDA_PATH for equivalence with FindCUDAToolkit. |