[Bf-blender-cvs] [5c0fb95d040] master: Buildbot: Get rid of OpenJPEG 2 hack

[Sergey Sharybin]

Commit: 5c0fb95d040b7f3dc18f228c414dfe97684b947a
Author: Sergey Sharybin
Date:   Thu Aug 30 10:00:23 2018 +0200
Branches: master
https://developer.blender.org/rB5c0fb95d040b7f3dc18f228c414dfe97684b947a

Buildbot: Get rid of OpenJPEG 2 hack

Also clarified some options and decisions.

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

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 c3da19451b5..0ff018161e5 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -172,12 +172,13 @@ set(PYTHON_VERSION    3.7 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.
+# 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)
-set(OPENJPEG_LIBRARY "${LIBDIR}/openjpeg/lib/libopenjp2.a" 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.
 set(PCRE_INCLUDE_DIR          "/usr/include"                        CACHE STRING "" FORCE)
 set(PCRE_LIBRARY              "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)