Commit: 21f15e2c458e277137f1791f9e60629e1e46f036
Author: Campbell Barton
Date: Sat Jul 19 23:59:51 2014 +1000
https://developer.blender.org/rB21f15e2c458e277137f1791f9e60629e1e46f036
CMake FindOpenEXR.cmake was using OPENEXR_VERSION unset
===================================================================
M build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake
b/build_files/cmake/Modules/FindOpenEXR.cmake
index 7190cfc..1c59ef4 100644
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -34,6 +34,9 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR}
STREQUAL "")
SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
ENDIF()
+# Old versions (before 2.0?) do not have any version string, just assuming
this should be fine though.
+SET(_openexr_libs_ver_init "2.0")
+
SET(_openexr_FIND_COMPONENTS
Half
Iex
@@ -82,12 +85,9 @@ IF(OPENEXR_INCLUDE_DIR)
IF(OPENEXR_BUILD_SPECIFICATION)
MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[
\t]+\"([.0-9]+)\".*"
- "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
- SET("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
+ "\\1" _openexr_libs_ver_init ${OPENEXR_BUILD_SPECIFICATION})
ELSE()
- # Old versions (before 2.0?) do not have any version string, just
assuming 2.0 should be fine though.
- MESSAGE(WARNING "Could not determine ILMBase library version, assuming
2.0.")
- SET("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
+ MESSAGE(WARNING "Could not determine ILMBase library version, assuming
${_openexr_libs_ver_init}.")
ENDIF()
UNSET(_openexr_CONFIG CACHE)
@@ -95,6 +95,9 @@ IF(OPENEXR_INCLUDE_DIR)
ENDIF()
ENDIF()
+SET("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of
OpenEXR lib")
+UNSET(_openexr_libs_ver_init)
+
STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver
${OPENEXR_VERSION})
SET(_openexr_LIBRARIES)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
