diff options
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 14 | ||||
-rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 22 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenJPEG.cmake | 1 |
3 files changed, 29 insertions, 8 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index e79bab3354a..d47a5e65d3c 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -110,7 +110,6 @@ endfunction() harvest(alembic/include alembic/include "*.h") harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a) -harvest(blosc/lib openvdb/lib "*.a") harvest(boost/include boost/include "*") harvest(boost/lib boost/lib "*.a") harvest(ffmpeg/include ffmpeg/include "*.h") @@ -135,6 +134,18 @@ harvest(ogg/lib ffmpeg/lib "*.a") harvest(openal/include openal/include "*.h") if(UNIX AND NOT APPLE) harvest(openal/lib openal/lib "*.a") + + harvest(blosc/include blosc/include "*.h") + harvest(blosc/lib blosc/lib "*.a") + + harvest(zlib/include zlib/include "*.h") + harvest(zlib/lib zlib/lib "*.a") + + harvest(xml2/include xml2/include "*.h") + harvest(xml2/lib xml2/lib "*.a") +else() + harvest(blosc/lib openvdb/lib "*.a") + harvest(xml2/lib opencollada/lib "*.a") endif() harvest(opencollada/include/opencollada opencollada/include "*.h") harvest(opencollada/lib/opencollada opencollada/lib "*.a") @@ -178,7 +189,6 @@ harvest(vorbis/lib ffmpeg/lib "*.a") harvest(vpx/lib ffmpeg/lib "*.a") harvest(webp/lib ffmpeg/lib "*.a") harvest(x264/lib ffmpeg/lib "*.a") -harvest(xml2/lib opencollada/lib "*.a") harvest(xvidcore/lib ffmpeg/lib "*.a") endif() diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 0500bfa7f99..71811fd23e2 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -9,10 +9,12 @@ if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so") message(STATUS "Building in GLibc-2.24 environment") set(GLIBC "2.24") set(MULTILIB "/x86_64-linux-gnu") + set(LIBDIR_NAME "linux_x86_64") elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so") message(STATUS "Building in GLibc-2.24 environment") set(GLIBC "2.24") set(MULTILIB "/i386-linux-gnu") + set(LIBDIR_NAME "linux_i686") elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so") message(STATUS "Building in GLibc-2.19 environment") set(GLIBC "2.19") @@ -160,17 +162,25 @@ set(BLOSC_LIBRARY else() -# Set path to precompiled libraries. -set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) -string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) -set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}") +set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE) # TODO(sergey): Remove once Python is oficially bumped to 3.7. -set(PYTHON_VERSION 3.7) +set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE) + +# Platform specific configuration, to ensure static linking against everything. -# Ensure specific configuration of various libraries. 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. +set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) +set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE) + endif() # Additional linking libraries diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index 85a4c131fb1..a6c28be6782 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -47,6 +47,7 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR FIND_LIBRARY(OPENJPEG_LIBRARY NAMES openjpeg + openjp2 HINTS ${_openjpeg_SEARCH_DIRS} PATH_SUFFIXES |