Commit: e74e622776a53e4ab5696d4b6fd17638dc2e9210
Author: Sergey Sharybin
Date: Thu Feb 11 13:51:47 2016 +0100
Branches: master
https://developer.blender.org/rBe74e622776a53e4ab5696d4b6fd17638dc2e9210
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.
===================================================================
M intern/cycles/cmake/external_libs.cmake
===================================================================
diff --git a/intern/cycles/cmake/external_libs.cmake
b/intern/cycles/cmake/external_libs.cmake
index 616dd94..403a054 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()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
