diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-26 14:00:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-26 14:00:36 +0300 |
| commit | 0970ed0550200bb743f0a7207623927d0b487c2f (patch) | |
| tree | ed55bcd50fd2a1491a0e9edf7fb82f6a60224b15 /CMakeLists.txt | |
| parent | 3a038db576e97c0e720a92af05a218ed71ed121a (diff) | |
| parent | acd1d1a31d1ac7343f8656dbd3b04c5342f306be (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eea7876e17b..d38c7d14eb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ option_defaults_init( _init_BUILDINFO _init_CODEC_FFMPEG _init_CYCLES_OSL - _init_CYCLES_OPENSUBDIV _init_IMAGE_OPENEXR _init_INPUT_NDOF _init_JACK @@ -174,7 +173,6 @@ if(UNIX AND NOT APPLE) # disable less important dependencies by default set(_init_CODEC_FFMPEG OFF) set(_init_CYCLES_OSL OFF) - set(_init_CYCLES_OPENSUBDIV OFF) set(_init_IMAGE_OPENEXR OFF) set(_init_JACK OFF) set(_init_OPENCOLLADA OFF) @@ -406,7 +404,6 @@ 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) option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) |