Differential D11073 Diff 26718 files/OpenEXR-instead-of-ilmbase.patch

Changeset View

Standalone View

files/OpenEXR-instead-of-ilmbase.patch

This file was added.

				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -215,6 +215,7 @@ ENDIF()
				ENDIF()

				FIND_PACKAGE(OpenEXR REQUIRED)
				+include_directories(${IMATH_INCLUDE_DIR})
				include_directories(${OPENEXR_INCLUDE_DIR})

				FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
				--- a/CMakeModules/FindOpenEXR.cmake
				+++ b/CMakeModules/FindOpenEXR.cmake
				@@ -32,17 +32,16 @@ ENDIF (NOT WIN32 OR MINGW)
				${SOURCE_BASE_DIR}/Deploy/include
				)

				- include(FindLibraryWithDebug)
				- find_library_with_debug(OPENEXR_HALF_LIBRARY
				- WIN32_DEBUG_POSTFIX d
				- NAMES Half-2_5 Half-2_4 Half-2_3 Half
				- PATHS
				- ${_OPENEXRLinkDir}
				- ${SYSTEM_LIB_DIRS}
				- ${SOURCE_BASE_DIR}/Deploy/lib/
				- ${SOURCE_BASE_DIR}/Deploy/lib/Release
				+ FIND_PATH(IMATH_INCLUDE_DIR half.h
				+ PATH_SUFFIXES Imath
				+ PATHS
				+ ${_OpenEXRIncDir}
				+ /usr/include
				+ /usr/local/include
				+ ${SOURCE_BASE_DIR}/Deploy/include
				)
				-
				+
				+ include(FindLibraryWithDebug)
				find_library_with_debug(OPENEXR_IEX_LIBRARY
				WIN32_DEBUG_POSTFIX d
				NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
				@@ -74,9 +73,9 @@ ENDIF (NOT WIN32 OR MINGW)
				)


				- find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
				+ find_library_with_debug(OPENEXR_OPENEXR_LIBRARY
				WIN32_DEBUG_POSTFIX d
				- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
				+ NAMES OpenEXR-3_0 OpenEXR
				PATHS
				${_OPENEXRLinkDir}
				${SYSTEM_LIB_DIRS}
				@@ -90,12 +89,12 @@ ENDIF (NOT WIN32 OR MINGW)

				FIND_PACKAGE(ZLIB)

				- if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY AND ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)
				+ if (OPENEXR_INCLUDE_DIR AND IMATH_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_OPENEXR_LIBRARY AND OPENEXR_IEX_LIBRARY AND ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)
				set(OPENEXR_FOUND TRUE)
				if (OPENEXR_ILMTHREAD_LIBRARY)
				- set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
				+ set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
				else ()
				- set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
				+ set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
				endif ()
				endif ()

				@@ -113,11 +112,11 @@ ENDIF (NOT WIN32 OR MINGW)

				MARK_AS_ADVANCED(
				OPENEXR_INCLUDE_DIR
				+ IMATH_INCLUDE_DIR
				OPENEXR_LIBRARIES
				- OPENEXR_ILMIMF_LIBRARY
				+ OPENEXR_OPENEXR_LIBRARY
				OPENEXR_IMATH_LIBRARY
				OPENEXR_IEX_LIBRARY
				- OPENEXR_HALF_LIBRARY
				OPENEXR_ILMTHREAD_LIBRARY )

				endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
				--- a/CMakeModules/FindVIGRA.cmake
				+++ b/CMakeModules/FindVIGRA.cmake
				@@ -74,7 +74,7 @@ IF (VIGRA_FOUND)
				OUTPUT_STRIP_TRAILING_WHITESPACE
				)
				STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
				- IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
				+ IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr")
				MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
				ENDIF()
				ELSE()