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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-11 15:51:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-11-07 16:47:10 +0300
commite74e622776a53e4ab5696d4b6fd17638dc2e9210 (patch)
tree772ed9f64fe516d982b9e1c58a3412b6463083ba
parent6f3f27c0ccf8801be87f0877304642d61c0d98e5 (diff)
Fix compilation error when CUDA toolkit is not installed
After CUDA dynload changes having CUDA toolkit became required in order to compile Cycles. This only happened due to wrong default value to the option.
-rw-r--r--intern/cycles/cmake/external_libs.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 616dd940801..403a0540963 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -44,6 +44,10 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
else()
message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
set(WITH_CYCLES_CUDA_BINARIES OFF)
+ if(NOT WITH_CUDA_DYNLOAD)
+ message(STATUS "Additionally falling back to dynamic CUDA load")
+ set(WITH_CUDA_DYNLOAD ON)
+ endif()
endif()
endif()