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/Modules/FindOpenJPEG.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'build_files/cmake/Modules') 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} -- cgit v1.2.3