[Bf-blender-cvs] [fb12fb4] temp-openjpeg: OpenJPEG: Fix compilation error on Debian with both 1.5 and 2.1 versions installed
Sergey Sharybin
noreply at git.blender.org
Tue Jul 12 14:53:05 CEST 2016
Commit: fb12fb45a7e1d1a90c69fd8055b12312e31ae875
Author: Sergey Sharybin
Date: Tue Jul 12 14:53:20 2016 +0200
Branches: temp-openjpeg
https://developer.blender.org/rBfb12fb45a7e1d1a90c69fd8055b12312e31ae875
OpenJPEG: Fix compilation error on Debian with both 1.5 and 2.1 versions installed
===================================================================
M build_files/cmake/Modules/FindOpenJPEG.cmake
===================================================================
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake
index 9b6bb68..1f82591 100644
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -41,8 +41,9 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES
- include
+ openjpeg-2.1
include/openjpeg-2.1
+ include
)
FIND_LIBRARY(OPENJPEG_LIBRARY
More information about the Bf-blender-cvs
mailing list