commit 7e854614b4b5a0cb9868f2fb8b1e33a17782f122
author Brad King <brad.king@kitware.com> Fri Jun 19 12:10:25 2020 +0000
committer Kitware Robot <kwrobot@kitware.com> Fri Jun 19 08:10:33 2020 -0400
tree 6af3cd06bfd6900f9af487d0de15061d1c691c8a
parent c0a9fc1dd6c40625e612222cfe89d4426df73db9
parent d9c1f05924239fafc159ed0b24ecdc24228c8e34

Merge topic 'cuda_nvcc_exe_search'

d9c1f05924 CUDA: Fix NVCC executable search during compiler detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4920

Modules/CMakeDetermineCUDACompiler.cmake

diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index e12da45..335305e 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -76,13 +76,7 @@
 
   # 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.