[Bf-blender-cvs] [7a6911a10c9] master: Buildbot: Make configuration to pass config state

Sergey Sharybin noreply at git.blender.org
Wed Aug 29 17:57:35 CEST 2018


Commit: 7a6911a10c9ed17c080963843f373c5531fee239
Author: Sergey Sharybin
Date:   Wed Aug 29 17:56:17 2018 +0200
Branches: master
https://developer.blender.org/rB7a6911a10c9ed17c080963843f373c5531fee239

Buildbot: Make configuration to pass config state

- Foe some reason CMake's platform and processor are not intialized there.

- Need to set variables in cache, otherwise they are not visible in the
  actual CMake files.

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

M	build_files/buildbot/config/blender_linux.cmake

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

diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 473b1dd0d68..f4659b2ce81 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -9,10 +9,12 @@ if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so")
 	message(STATUS "Building in GLibc-2.24 environment")
 	set(GLIBC "2.24")
 	set(MULTILIB "/x86_64-linux-gnu")
+	set(LIBDIR_NAME "linux_x86_64")
 elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so")
 	message(STATUS "Building in GLibc-2.24 environment")
 	set(GLIBC "2.24")
 	set(MULTILIB "/i386-linux-gnu")
+	set(LIBDIR_NAME "linux_i686")
 elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
@@ -161,13 +163,10 @@ set(BLOSC_LIBRARY
 
 else()
 
-# Set path to precompiled libraries.
-set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
-string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME)
-set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}")
+set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE)
 
 # TODO(sergey): Remove once Python is oficially bumped to 3.7.
-set(PYTHON_VERSION 3.7)
+set(PYTHON_VERSION    3.7 CACHE BOOL "" FORCE)
 
 # Ensure specific configuration of various libraries.
 set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)



More information about the Bf-blender-cvs mailing list