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>2018-09-12 09:28:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-12 09:28:50 +0300
commite6540ec175cf3689adf0425afdb7847c68f23c2e (patch)
treee6136739c27bc7e69ada99324dd549ad7543240f /build_files/cmake/Modules
parent265b5238de738a821bed0c56fb0ef3abefae0d05 (diff)
parent2e36a1809f09c9465f9d5eb7753f5dba531caaf1 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r--build_files/cmake/Modules/FindOpenJPEG.cmake11
1 files changed, 11 insertions, 0 deletions
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