Differential D11072 Diff 26717 files/OpenEXR-instead-of-ilmbase.patch

Changeset View

Standalone View

files/OpenEXR-instead-of-ilmbase.patch

This file was added.

				--- a/config/FindOpenEXR.cmake
				+++ b/config/FindOpenEXR.cmake
				@@ -24,30 +24,32 @@
				# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

				FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
				+FIND_PATH(IMATH_INCLUDE_DIR half.h PATH_SUFFIXES Imath)

				-FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
				+FOREACH(V -3_0 "" -2_2 -2_1 -2_0 -1_7)
				if(NOT OPENEXR_ILMIMF_LIBRARY)
				- FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
				- if(OPENEXR_ILMIMF_LIBRARY)
				+ FIND_LIBRARY(OPENEXR_OPENEXR_LIBRARY NAMES OpenEXR${V})
				+ if(OPENEXR_OPENEXR_LIBRARY)
				set(OPENEXR_VERSION ${V})
				endif()
				endif()
				ENDFOREACH(V)

				+set(OPENEXR_VERSION -3_0)
				FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
				FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
				FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
				-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)

				INCLUDE(FindPackageHandleStandardArgs)
				FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
				- OPENEXR_HALF_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_IMATH_LIBRARY
				- OPENEXR_ILMIMF_LIBRARY OPENEXR_INCLUDE_DIR
				+ OPENEXR_OPENEXR_LIBRARY
				+ OPENEXR_IEX_LIBRARY OPENEXR_IMATH_LIBRARY
				+ OPENEXR_INCLUDE_DIR IMATH_INCLUDE_DIR
				)

				IF(OpenEXR_FOUND)
				- SET(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY}
				- ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY}
				+ SET(OPENEXR_LIBRARIES ${OPENEXR_OPENEXR_LIBRARY}
				+ ${IMATH_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY}
				${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} )

				if(MSVC)
				--- a/src/impex/CMakeLists.txt
				+++ b/src/impex/CMakeLists.txt
				@@ -20,6 +20,7 @@ ENDIF(TIFF_FOUND)

				IF(OpenEXR_FOUND)
				ADD_DEFINITIONS(-DHasEXR ${OPENEXR_CPPFLAGS})
				+ INCLUDE_DIRECTORIES(${SUPPRESS_WARNINGS} ${IMATH_INCLUDE_DIR})
				INCLUDE_DIRECTORIES(${SUPPRESS_WARNINGS} ${OPENEXR_INCLUDE_DIR})
				ENDIF(OpenEXR_FOUND)