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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-08-29 18:56:17 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-29 18:57:30 +0300
commit7a6911a10c9ed17c080963843f373c5531fee239 (patch)
tree3c9e87cd6b1ffee461458d2e8e9fcf0b1d7be599 /build_files
parent39eb05161690510ecec4c30129a9f8d5532d39c9 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/config/blender_linux.cmake9
1 files changed, 4 insertions, 5 deletions
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)