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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-30 14:59:34 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-30 14:59:34 +0300
commitcaa7f749ed6e9b490d4b0d23c21c0c1d7c12447c (patch)
tree888742a0ec2177580f3fc8bf69627501e00cfeba /build_files/cmake/Modules
parent9b937c8404e10dab59c394bb9c838d4e8c5bf65b (diff)
parent8c3d2e549cff4d9c369c68936e0fce6b7ddc495f (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r--build_files/cmake/Modules/FindOpenJPEG.cmake1
1 files changed, 1 insertions, 0 deletions
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