Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhowetuft <howetuft>2022-03-07 17:42:47 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-04-06 22:30:07 +0300
commit013d0631e6842230b6043742289bc05de66f6402 (patch)
tree3cfe418a43af1692b7be58e111eaa0f4e16f6cb1
parent6aaae444736199bafd1d41ec0667c03938ac80ed (diff)
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
-rw-r--r--intern/cycles/kernel/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
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