diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-12-08 21:25:37 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-12-08 21:29:54 +0400 |
| commit | bac86a08259e23e6e1a8ff6c1ba4efdfe53a48fd (patch) | |
| tree | 8e03bf0c7afc1b6501e132d24bb0adfbb68372f9 /build_files/cmake/Modules/FindOpenEXR.cmake | |
| parent | 901ebbd94acb747a774fa287d94139b703e326e9 (diff) | |
Update install_deps.sh to OIIO 1.39 and OSL 1.4.0.
Note that I also updated OpenEXR to 2.1.0 (and updated our CMake openexr module as well).
Users will have to update their build settings as told by the script (also in BUILD_NOTES.txt generated file)!
Note I removed all ugly patches from this script, we are currently using custom git repo for OpenEXR/OIIO/OSL,
hopefully we will soon be able to use vanillia code from official repos!
Diffstat (limited to 'build_files/cmake/Modules/FindOpenEXR.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenEXR.cmake | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 9ea0f6c9efd..8fc2d572b62 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -34,13 +34,27 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "") SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR}) ENDIF() -SET(_openexr_FIND_COMPONENTS - Half - Iex - IlmImf - IlmThread - Imath -) +if (NOT OPENEXR_VERSION) + SET(OPENEXR_VERSION "2.0.1") +endif() +if (${OPENEXR_VERSION} VERSION_LESS "2.1") + SET(_openexr_FIND_COMPONENTS + Half + Iex + IlmImf + IlmThread + Imath + ) +else () + string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) + SET(_openexr_FIND_COMPONENTS + Half + Iex-${_openexr_libs_ver} + IlmImf-${_openexr_libs_ver} + IlmThread-${_openexr_libs_ver} + Imath-${_openexr_libs_ver} + ) +endif () SET(_openexr_SEARCH_DIRS ${OPENEXR_ROOT_DIR} |