[Bf-blender-cvs] [fd352cf8f61] master: Buildbot: Tweak configuration to actually ve successful in chroot
Sergey Sharybin
noreply at git.blender.org
Wed Aug 29 18:32:45 CEST 2018
Commit: fd352cf8f613212599fab7e6547510ac422b7f4e
Author: Sergey Sharybin
Date: Wed Aug 29 18:32:27 2018 +0200
Branches: master
https://developer.blender.org/rBfd352cf8f613212599fab7e6547510ac422b7f4e
Buildbot: Tweak configuration to actually ve successful in chroot
===================================================================
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 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
More information about the Bf-blender-cvs
mailing list