From f125dfcd302dcc65547c8f67390187f92f696e49 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Sep 2023 11:45:25 -0400 Subject: CUDA: Clarify order of logic finding CUDA Toolkit for compiler Finish all the search logic before using any results. --- Modules/CMakeDetermineCUDACompiler.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 734b039..1ddb7ba 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -211,9 +211,6 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) endif() unset(_CUDA_NVCC_OUT) - set(CMAKE_CUDA_DEVICE_LINKER "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/nvlink${CMAKE_EXECUTABLE_SUFFIX}") - set(CMAKE_CUDA_FATBINARY "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/fatbinary${CMAKE_EXECUTABLE_SUFFIX}") - # In a non-scattered installation the following are equivalent to CMAKE_CUDA_COMPILER_TOOLKIT_ROOT. # We first check for a non-scattered installation to prefer it over a scattered installation. @@ -252,6 +249,9 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) # Don't leak variables unnecessarily to user code. unset(_CUDA_NVCC_EXECUTABLE) + + set(CMAKE_CUDA_DEVICE_LINKER "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/nvlink${CMAKE_EXECUTABLE_SUFFIX}") + set(CMAKE_CUDA_FATBINARY "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/fatbinary${CMAKE_EXECUTABLE_SUFFIX}") endif() set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-v") -- cgit v0.12