diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 16:52:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 16:52:17 +0400 |
| commit | c42772fc95d62b4cb67e2ca09e5928ef7a6e054d (patch) | |
| tree | 0a77247c3673e0bf7f3b9550588b34724f952f42 /CMakeLists.txt | |
| parent | dfc30d12292987cde384d999a52a9d52d13bdb2c (diff) | |
Cycles:
* Add back option to bundle CUDA kernel binaries with builds.
* Disable runtime CUDA kernel compilation on Windows, couldn't get this working,
since it seems to depend on visual studio being installed, even though for
this particular case it shouldn't be needed. CMake only at the moment.
* Runtime compilation on linux/mac should now work if nvcc is not installed in
the default location, but available in PATH.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bc6cab1dc5..3b328669e48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,8 +214,10 @@ endif() option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) # Cycles -option(WITH_CYCLES "Enable Cycles Render Engine" ON) -OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF) +option(WITH_CYCLES "Enable cycles Render Engine" ON) +option(WITH_CYCLES_TEST "Build cycles test application" OFF) +option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) +set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for") # disable for now, but plan to support on all platforms eventually option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) |