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/cmake | |
| 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/cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenJPEG.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index a6c28be6782..20d1994c7ba 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -41,12 +41,10 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR ${_openjpeg_SEARCH_DIRS} PATH_SUFFIXES include - include/openjpeg-1.5 ) FIND_LIBRARY(OPENJPEG_LIBRARY NAMES - openjpeg openjp2 HINTS ${_openjpeg_SEARCH_DIRS} diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 54a41f95819..69a1eb2eb3a 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -448,7 +448,7 @@ function(setup_liblinks if(WITH_IMAGE_OPENEXR) target_link_libraries(${target} ${OPENEXR_LIBRARIES}) endif() - if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) + if(WITH_IMAGE_OPENJPEG) target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) endif() if(WITH_CODEC_FFMPEG) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 2fc7c2cdd9d..b10a2e175c1 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -166,7 +166,6 @@ endif() if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG) # use openjpeg from libdir that is linked into ffmpeg set(OPENJPEG ${LIBDIR}/openjpeg) - set(WITH_SYSTEM_OPENJPEG ON) set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include) set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) endif() |