[Bf-blender-cvs] [06ff734d489] master: Buildbot: Attempt to point precompiled libraries to a correct folder

Sergey Sharybin noreply at git.blender.org
Wed Oct 9 10:35:12 CEST 2019


Commit: 06ff734d4893a8cfbd0ec619accf947b291c8bd3
Author: Sergey Sharybin
Date:   Wed Oct 9 10:34:12 2019 +0200
Branches: master
https://developer.blender.org/rB06ff734d4893a8cfbd0ec619accf947b291c8bd3

Buildbot: Attempt to point precompiled libraries to a correct folder

The CMAKE_SOURCES variable is not yet initialized when the buildbot
configuration is read. This is similar to the include of full release
configuration happening earlier in the file.

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

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 d07ccf610ba..812a130ad2c 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -27,7 +27,7 @@ set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
 
 # ######## Release environment specific settings ########
 
-set(LIBDIR "${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME}" CACHE STRING "" FORCE)
+set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../lib/${LIBDIR_NAME}" CACHE STRING "" FORCE)
 
 # Platform specific configuration, to ensure static linking against everything.



More information about the Bf-blender-cvs mailing list