diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 19:32:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 19:32:27 +0300 |
| commit | fd352cf8f613212599fab7e6547510ac422b7f4e (patch) | |
| tree | 6270aef6c3a6425ecc21cf11e9483b450cc283e0 /build_files | |
| parent | 7a6911a10c9ed17c080963843f373c5531fee239 (diff) | |
Buildbot: Tweak configuration to actually ve successful in chroot
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index f4659b2ce81..c3da19451b5 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -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. 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) +# 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() # Additional linking libraries |