Buildbot: Get rid of OpenJPEG 2 hack
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 08:00:23 +0000 (10:00 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 08:00:23 +0000 (10:00 +0200)
Also clarified some options and decisions.

build_files/buildbot/config/blender_linux.cmake

index c3da19451b5959b21c8e43d019211dc65c905684..0ff018161e508f168495a64139e789f4f7656979 100644 (file)
@@ -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)