Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Buildbot: Tweak configuration to actually ve successful in chroot

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-29 18:32:27 +02:00
parent 7a6911a10c
commit fd352cf8f6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build_files/buildbot/config/blender_linux.cmake
View File

@@ -168,9 +168,19 @@ set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE)
# TODO(sergey): Remove once Python is oficially bumped to 3.7. # TODO(sergey): Remove once Python is oficially bumped to 3.7.
set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE) set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE)
# Ensure specific configuration of various libraries. # Platform specific configuration, to ensure static linking against everything.
set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
# Force using our precompiled openjpeg library.
#
# Also, FindOpenJPEG is stupid and is not aware about library called libopenjp2.
set(WITH_SYSTEM_OPENJPEG ON CACHE BOOL "" FORCE)
set(OPENJPEG_LIBRARY "${LIBDIR}/openjpeg/lib/libopenjp2.a" CACHE BOOL "" FORCE)
set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE)
set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)
endif() endif()
# Additional linking libraries # Additional linking libraries