Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Buildbot: Get rid of OpenJPEG 2 hack

Browse Source 
Also clarified some options and decisions.
This commit is contained in:
Sergey Sharybin
2018-08-30 10:00:23 +02:00
parent 1fdde7892d
commit 5c0fb95d04
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/buildbot/config/blender_linux.cmake
View File

@@ -172,12 +172,13 @@ set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE)
set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
# Force using our precompiled openjpeg library. # TODO(sergey): Move up to the rest of WITH_SYSTEM and DYNLOAD configuration,
# # once old chroot is officially retired.
# Also, FindOpenJPEG is stupid and is not aware about library called libopenjp2.
set(WITH_SYSTEM_OPENJPEG ON CACHE BOOL "" FORCE) 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_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE)
set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE) set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)