Commit: 596a9c6983c3e3d64f2c3733a53865d971924f77 Author: howetuft Date: Mon Mar 7 15:42:47 2022 +0100 Branches: temp-T96710-pbvh-pixels https://developer.blender.org/rB596a9c6983c3e3d64f2c3733a53865d971924f77
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=<path-to-host-compiler>` If the option is not specified, the build configuration behaves as previously. Differential Revision: https://developer.blender.org/D14248 =================================================================== M intern/cycles/kernel/CMakeLists.txt =================================================================== 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 _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
