Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-05 13:42:00 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-05 14:29:39 +0300
commita474409f0bf04fb2b87d7a914ea3f18d97623cdc (patch)
tree3c1a021a59015834fd40d596f5b82f1d5aec9728 /CMakeLists.txt
parentc54df2ad47026a35c2629ba115ced64e7f33a42e (diff)
OpenSubdiv: Enable by default on the supported platforms
This commit makes sure Linux and Windows buildbots are using OpenSubdiv and also enables OpenSubdiv by default on Windows. OSX is kept disabled still, this is due to OpenGL restrictions which are not solved in any way yet. Linux is defaults to OpenSubdiv disabled because it needs precompiled library. The documentation could be found there: http://wiki.blender.org/index.php/User:Nazg-gul/OpenSubdiv
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 198f6a3a6fe..c6e3c7a3f9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,6 +158,7 @@ option_defaults_init(
_init_SDL
_init_FFTW3
_init_GAMEENGINE
+ _init_OPENSUBDIV
)
# customize...
@@ -174,11 +175,13 @@ if (UNIX AND NOT APPLE)
set(_init_OPENCOLORIO OFF)
set(_init_SDL OFF)
set(_init_FFTW3 OFF)
+ set(_init_OPENSUBDIV OFF)
elseif(WIN32)
set(_init_JACK OFF)
elseif(APPLE)
set(_init_INPUT_NDOF OFF)
set(_init_JACK OFF)
+ set(_init_OPENSUBDIV OFF)
endif()
@@ -229,7 +232,7 @@ option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
option(WITH_COMPOSITOR_WERROR "Treat warnings as errors in compositor code" OFF)
mark_as_advanced(WITH_COMPOSITOR_WERROR)
-option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" OFF)
+option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV)
option(WITH_SUBSURF_WERROR "Treat warnings as errors in subsurf code" OFF)
mark_as_advanced(WITH_COMPOSITOR_WERROR)