[Bf-blender-cvs] [b066d582160] master: CMake mini-rewrite: Sync code check with BKE_blender_version_is_alpha
Dalai Felinto
noreply at git.blender.org
Fri Nov 26 13:05:42 CET 2021
Commit: b066d5821607091bb86e0fcb2dbbd3e1067ca4d2
Author: Dalai Felinto
Date: Fri Nov 26 09:33:47 2021 +0100
Branches: master
https://developer.blender.org/rBb066d5821607091bb86e0fcb2dbbd3e1067ca4d2
CMake mini-rewrite: Sync code check with BKE_blender_version_is_alpha
Reproduce the logic we already do in C (BKE_blender_version_is_alpha)
and the CMake file.
Otherwise it can get out of sync if we add/rename the non-alpha release cycles.
No functional change.
Differential Revision: https://developer.blender.org/D13379
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8ba8e2c080..d0bed1362d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -501,12 +501,10 @@ if(WIN32)
endif()
# This should be turned off when Blender enter beta/rc/release
-if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
- "${BLENDER_VERSION_CYCLE}" STREQUAL "rc" OR
- "${BLENDER_VERSION_CYCLE}" STREQUAL "beta")
- set(WITH_EXPERIMENTAL_FEATURES OFF)
-else()
+if("${BLENDER_VERSION_CYCLE}" STREQUAL "alpha")
set(WITH_EXPERIMENTAL_FEATURES ON)
+else()
+ set(WITH_EXPERIMENTAL_FEATURES OFF)
endif()
# Unit testsing
More information about the Bf-blender-cvs
mailing list