[Bf-blender-cvs] [83ae39c] master: CMake: Skip addons_contrib for release candidate builds

Sergey Sharybin noreply at git.blender.org
Mon Sep 5 10:21:02 CEST 2016


Commit: 83ae39cc2e06e7354dd73b6a5cf7007b446d6ccc
Author: Sergey Sharybin
Date:   Fri Sep 2 14:42:01 2016 +0200
Branches: master
https://developer.blender.org/rB83ae39cc2e06e7354dd73b6a5cf7007b446d6ccc

CMake: Skip addons_contrib for release candidate builds

Nowadays release candidates are supposed to be as close to the final
release as possible.

Safe for 2.78 release branch.

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

M	source/creator/CMakeLists.txt

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index fc02dfd..f65688e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -338,7 +338,8 @@ if(WITH_PYTHON)
 	# install(CODE "message(\"copying blender scripts...\")")
 	
 	# exclude addons_contrib if release
-	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
+	if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
+	   "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
 		set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
 	else()
 		set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything




More information about the Bf-blender-cvs mailing list