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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-08-30 10:55:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-30 10:55:40 +0300
commit1fdde7892d99125e585f3eac92fb67973d5563ea (patch)
treeb284ebde966ccb2dc68ac4ab477d01f79a1df914 /build_files/cmake/Modules
parent75b781fe8dfe221ba62730c734181c3c05e1aff2 (diff)
CMake: Automatically detect OpenJPEG 2 libraries
There is chance that on a system with both versions installed this *might* cause some issues. Such system will be pain to support out of the box anyway. This change allows to use precompiled libraries without extra modifications in the config.
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