Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-06-09 14:56:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-07-12 16:13:30 +0300
commitf12204196fb1ee985ab9745cf9c70877601145f9 (patch)
tree9a0ea8bb9eaa869a9e4b9c74b80f8dd5b86b0394 /build_files
parent57983012913f98056315dd3fb03552f5d75258d7 (diff)
OpenJPEG: update to 2.1 from 1.5
Stream handling has changed so this required changes to how files & memory are accessed.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/Modules/FindOpenJPEG.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake
index d765103638b..1f825914a3c 100644
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -41,13 +41,14 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES
+ openjpeg-2.1
+ include/openjpeg-2.1
include
- include/openjpeg-1.5
)
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES
- openjpeg
+ openjp2
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES