diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-30 15:20:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 13:45:05 +0300 |
| commit | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (patch) | |
| tree | 9a8fa5b751f9b27380de9b3dde35f93086deda0b /build_files/buildbot | |
| parent | bf8aac0d491ae7ea9c52c5911f61f041cfffdafc (diff) | |
Build: require OpenJPEG 2.x minimum, remove bundled version.
* WITH_SYSTEM_OPENJPEG is removed and is now always on, this was already
the case for macOS and Windows.
* This should not break existing Linx builds. If there is no new enough
OpenJPEG installed, CMake will no find libopenjp2 and WITH_IMAGE_OPENJPEG
will be disabled.
* install_deps.sh was updated with new package names, since distributions
put this version in a new package.
Differential Revision: https://developer.blender.org/D3663
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 4 |
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 1c400339dfe..9ba91a9a463 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -172,10 +172,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. |