From 013d0631e6842230b6043742289bc05de66f6402 Mon Sep 17 00:00:00 2001 From: howetuft Date: Mon, 7 Mar 2022 15:42:47 +0100 Subject: Add CMake option to control CUDA host compiler This revision allows to specify CUDA host compiler (nvcc's -ccbin command line option) when configuring the build. It addresses the case where the C/C++ compiler to be used in CUDA toolchain should be different from the default C/C++ compiler, for instance in case of compilers versions conflicts or multiple installed compilers. The new CMake option is named `CUDA_HOST_COMPILER` and can be used as follows: `cmake -DCUDA_HOST_COMPILER=` If the option is not specified, the build configuration behaves as previously. Differential Revision: https://developer.blender.org/D14248 --- intern/cycles/kernel/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index cfd503a621d..d660289ed17 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -407,6 +407,11 @@ if(WITH_CYCLES_CUDA_BINARIES) -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_file} -Wno-deprecated-gpu-targets) + if(CUDA_HOST_COMPILER) + set(cuda_flags ${cuda_flags} + -ccbin="${CUDA_HOST_COMPILER}") + endif() + if(WITH_NANOVDB) set(cuda_flags ${cuda_flags} -D WITH_NANOVDB -- cgit v1.2.3