Differential D11053 Diff 26619 files/OpenEXR-instead-of-ilmbase.patch

Changeset View

Standalone View

				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -189,7 +189,7 @@ FIND_PACKAGE(PNG REQUIRED)
				INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})

				FIND_PACKAGE(OpenEXR REQUIRED)
				-INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
				+INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR" "${OPENEXR_INCLUDE_DIR}/Imath")

				FIND_PACKAGE(GSL REQUIRED)
				INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
				--- a/build_files/Modules/FindOpenEXR.cmake
				+++ b/build_files/Modules/FindOpenEXR.cmake
				@@ -39,20 +39,20 @@ if (NOT OPENEXR_VERSION)
				endif()
				if (${OPENEXR_VERSION} VERSION_LESS "2.1")
				SET(_openexr_FIND_COMPONENTS
				- Half
				Iex
				- IlmImf
				IlmThread
				Imath
				+ OpenEXR
				+ OpenEXRUtil
				)
				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}
				+ OpenEXR-${_openexr_libs_ver}
				+ OpenEXRUtil-${_openexr_libs_ver}
				)
				endif ()

				@@ -97,7 +97,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEX
				IF(OPENEXR_FOUND)
				SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
				# Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
				- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
				+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath)
				message(STATUS "OpenEXR found")
				ENDIF()