From a1651ddc98ec760e522ea2ea8169b726661fa2e6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 30 Aug 2018 14:20:19 +0200 Subject: 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 --- build_files/cmake/platform/platform_apple.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'build_files/cmake/platform/platform_apple.cmake') 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() -- cgit v1.2.3