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:
authorDalai Felinto <dalai@blender.org>2020-09-09 17:07:29 +0300
committerDalai Felinto <dalai@blender.org>2020-09-09 17:15:27 +0300
commit5c0eda51ffe5e312077b71b8972fbaef0c3a257b (patch)
tree8ea7771df50a177a79261b5d34229b7ae2908ad3 /CMakeLists.txt
parentddf4f2896878e3fd4a0f79d712a5e7b900b0cf7e (diff)
CMake: Force experimental features to be on/off based on release cycle
This makes it error-proof to disable/enable experimental features during the release cycles. Since it is handled by CMake it should always work reliably now (not depending on someone turning this on and off). Reviewed by Sergey Sharybin.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc49505a0b..5f1e84dd6df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,8 +439,12 @@ if(WIN32)
endif()
# This should be turned off when Blender enter beta/rc/release
-option(WITH_EXPERIMENTAL_FEATURES "Enable experimental features (still need to enable them in the user preferences)" ON)
-mark_as_advanced(WITH_EXPERIMENTAL_FEATURES)
+if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
+ set(WITH_EXPERIMENTAL_FEATURES OFF)
+else()
+ set(WITH_EXPERIMENTAL_FEATURES ON)
+endif()
# Unit testsing
option(WITH_GTESTS "Enable GTest unit testing" OFF)