diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 18:10:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 18:10:33 +0400 |
| commit | a56c6e18a8f3a7d520cdf8efc0b4a17e7ef9e341 (patch) | |
| tree | 087e25fb2d4c2d364cb8ab6866d00183f61a37c3 /CMakeLists.txt | |
| parent | 64ab4140268498384525e05596ea1f559b7cd3df (diff) | |
Cycles:
* Disable precompiled cuda binaries, always do at run time
* Change preview samples default to 10
* Hide volume panels since they don't do anything yet
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a44efdb0d..daf3940eab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,11 +215,6 @@ option(WITH_PYTHON_INSTALL "Copy system python into the blender install fo # Cycles option(WITH_CYCLES "Enable Cycles Render Engine" ON) -OPTION(WITH_CYCLES_OSL "Build with Open Shading Language support" OFF) -OPTION(WITH_CYCLES_CUDA "Build with CUDA binaries" OFF) -OPTION(WITH_CYCLES_BLENDER "Build Blender Python extension" ON) -OPTION(WITH_CYCLES_PARTIO "Build with Partio point cloud support (unfinished)" OFF) -OPTION(WITH_CYCLES_NETWORK "Build with network rendering support (unfinished)" OFF) OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF) # disable for now, but plan to support on all platforms eventually @@ -954,6 +949,9 @@ elseif(WIN32) set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}") endif() + # disable for now, not building yet + set(WITH_CYCLES OFF) + if(WITH_BOOST) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) |