diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:27:41 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:30:09 +0300 |
| commit | 9d0eac6ba5efe1b3712152c337fb171a771a8921 (patch) | |
| tree | 8d51f1b3800513d37211253cc3f93f6c2a929ca4 /CMakeLists.txt | |
| parent | 0c8aa85069fabd20d5f030f016a85ad060839066 (diff) | |
| parent | d3dd3739f6fe1ba640cdcad12d6bf4da6b356c59 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 84c47e20b2b..eea7876e17b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,6 +405,7 @@ option(WITH_CYCLES "Enable Cycles Render Engine" ON) option(WITH_CYCLES_STANDALONE "Build Cycles standalone application" OFF) option(WITH_CYCLES_STANDALONE_GUI "Build Cycles standalone with GUI" OFF) option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) +option(WITH_CYCLES_EMBREE "Build Cycles with Embree support" OFF) option(WITH_CYCLES_OPENSUBDIV "Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV}) option(WITH_CYCLES_CUDA_BINARIES "Build Cycles CUDA binaries" OFF) option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) |