diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 17:16:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-14 17:16:50 +0300 |
| commit | 3102bf28890c06b03cf7455604ec00fd1e27e89c (patch) | |
| tree | 47e0d1c09f146a51fc19e855c1fa2600db369787 /CMakeLists.txt | |
| parent | 618bc6c67954f80b3c0c0332f44648b3187c23ca (diff) | |
| parent | f6107af4cf4d907495e2e9c18e5866fd1d420650 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ce35da95f1..2c545a121a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,6 +426,13 @@ mark_as_advanced(WITH_CYCLES_LOGGING) mark_as_advanced(WITH_CYCLES_DEBUG) mark_as_advanced(WITH_CYCLES_NATIVE_ONLY) +option(WITH_CYCLES_DEVICE_CUDA "Enable Cycles CUDA compute support" ON) +option(WITH_CYCLES_DEVICE_OPENCL "Enable Cycles OpenCL compute support" ON) +option(WITH_CYCLES_NETWORK "Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF) +mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) +mark_as_advanced(WITH_CYCLES_DEVICE_OPENCL) +mark_as_advanced(WITH_CYCLES_NETWORK) + option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON) mark_as_advanced(WITH_CUDA_DYNLOAD) @@ -713,6 +720,15 @@ if(WITH_AUDASPACE) endif() endif() +# Auto-enable CUDA dynload if toolkit is not found. +if(NOT WITH_CUDA_DYNLOAD) + find_package(CUDA) + if (NOT CUDA_FOUND) + message("CUDA toolkit not found, using dynamic runtime loading of libraries instead") + set(WITH_CUDA_DYNLOAD ON) + endif() +endif() + #----------------------------------------------------------------------------- # Check for valid directories # ... a partial checkout may cause this. |