[Bf-blender-cvs] [1fdde7892d9] master: CMake: Automatically detect OpenJPEG 2 libraries

[Sergey Sharybin]

Commit: 1fdde7892d99125e585f3eac92fb67973d5563ea
Author: Sergey Sharybin
Date:   Thu Aug 30 09:55:40 2018 +0200
Branches: master
https://developer.blender.org/rB1fdde7892d99125e585f3eac92fb67973d5563ea

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.

===================================================================

M	build_files/cmake/Modules/FindOpenJPEG.cmake

===================================================================

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