[Bf-blender-cvs] [2e36a1809f0] master: CMake: add openjpeg 2x search paths

Campbell Barton noreply at git.blender.org
Wed Sep 12 08:17:31 CEST 2018


Commit: 2e36a1809f09c9465f9d5eb7753f5dba531caaf1
Author: Campbell Barton
Date:   Wed Sep 12 16:26:15 2018 +1000
Branches: master
https://developer.blender.org/rB2e36a1809f09c9465f9d5eb7753f5dba531caaf1

CMake: add openjpeg 2x search paths

Wasn't finding the include path by on Linux.

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

M	build_files/cmake/Modules/FindOpenJPEG.cmake

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

diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake
index 20d1994c7ba..0f1d0d0a865 100644
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -41,6 +41,17 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR
     ${_openjpeg_SEARCH_DIRS}
   PATH_SUFFIXES
     include
+    # Support future versions
+    openjpeg-2.9
+    openjpeg-2.8
+    openjpeg-2.7
+    openjpeg-2.6
+    openjpeg-2.5
+    openjpeg-2.4
+    openjpeg-2.3
+    openjpeg-2.2
+    openjpeg-2.1
+    openjpeg-2.0
 )
 
 FIND_LIBRARY(OPENJPEG_LIBRARY



More information about the Bf-blender-cvs mailing list