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:
authorCampbell Barton <ideasman42@gmail.com>2018-09-12 08:54:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-12 08:54:07 +0300
commit2597cd39982100efeeb13b597f3e432ef9346d85 (patch)
tree96b7cd824f5038d5a63ec025957e4503e544f95f /build_files/buildbot
parent7eecc9407415e18eaab2ded2fcc883edbf58c633 (diff)
parenta1651ddc98ec760e522ea2ea8169b726661fa2e6 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/config/blender_linux.cmake4
1 files changed, 0 insertions, 4 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index dafcf202de4..44048f70135 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -171,10 +171,6 @@ set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE)
set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
-# TODO(sergey): Move up to the rest of WITH_SYSTEM and DYNLOAD configuration,
-# once old chroot is officially retired.
-set(WITH_SYSTEM_OPENJPEG ON CACHE BOOL "" FORCE)
-
# We need to link OpenCOLLADA against PCRE library. Even though it is not installed
# on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its
# library pointing to a valid one.