[Bf-blender-cvs] [5c0eda51ffe] master: CMake: Force experimental features to be on/off based on release cycle

[Dalai Felinto]

Commit: 5c0eda51ffe5e312077b71b8972fbaef0c3a257b
Author: Dalai Felinto
Date:   Wed Sep 9 16:07:29 2020 +0200
Branches: master
https://developer.blender.org/rB5c0eda51ffe5e312077b71b8972fbaef0c3a257b

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.

===================================================================

M	CMakeLists.txt

===================================================================

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)