|
 |
4881623 |
Index: hugin-2020.0.0/CMakeLists.txt
|
|
|
4881623 |
===================================================================
|
|
|
4881623 |
--- hugin-2020.0.0.orig/CMakeLists.txt
|
|
|
4881623 |
+++ hugin-2020.0.0/CMakeLists.txt
|
|
|
69827ac |
@@ -214,7 +214,18 @@ ENDIF()
|
|
|
4881623 |
|
|
|
4881623 |
ENDIF()
|
|
|
4881623 |
|
|
|
4881623 |
-FIND_PACKAGE(OpenEXR REQUIRED)
|
|
|
4881623 |
+FIND_PACKAGE(Imath CONFIG)
|
|
|
4881623 |
+IF(TARGET Imath::Imath)
|
|
|
4881623 |
+ FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
|
|
|
4881623 |
+ FIND_PACKAGE(ZLIB REQUIRED)
|
|
|
4881623 |
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
|
|
|
4881623 |
+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
|
|
|
4881623 |
+ list(APPEND OPENEXR_INCLUDE_DIR ${IMATH_INCLUDE_DIR})
|
|
|
4881623 |
+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR Imath::Imath ${ZLIB_LIBRARIES})
|
|
|
69827ac |
+ set(OPENEXR_FOUND TRUE)
|
|
|
4881623 |
+ELSE()
|
|
|
4881623 |
+ FIND_PACKAGE(OpenEXR REQUIRED)
|
|
|
4881623 |
+ENDIF()
|
|
|
4881623 |
include_directories(${OPENEXR_INCLUDE_DIR})
|
|
|
4881623 |
|
|
|
4881623 |
FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
|
|
|
4881623 |
Index: hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
|
|
4881623 |
===================================================================
|
|
|
4881623 |
--- hugin-2020.0.0.orig/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
|
|
4881623 |
+++ hugin-2020.0.0/src/hugin_base/vigra_ext/ReduceOpenEXR.h
|
|
|
4881623 |
@@ -25,8 +25,8 @@
|
|
|
4881623 |
#include <vigra_ext/HDRUtils.h>
|
|
|
4881623 |
#include <vigra_ext/FileRAII.h>
|
|
|
4881623 |
|
|
|
4881623 |
-#include <ImfRgbaFile.h>
|
|
|
4881623 |
-#include <ImfArray.h>
|
|
|
4881623 |
+#include <OpenEXR/ImfRgbaFile.h>
|
|
|
4881623 |
+#include <OpenEXR/ImfArray.h>
|
|
|
4881623 |
|
|
|
4881623 |
|
|
|
4881623 |
// hack to read pgm header
|
|
|
69827ac |
Index: hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
|
|
|
69827ac |
===================================================================
|
|
|
69827ac |
--- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake
|
|
|
69827ac |
+++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
|
|
|
69827ac |
@@ -75,6 +75,9 @@ IF (VIGRA_FOUND)
|
|
|
69827ac |
)
|
|
|
69827ac |
STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
|
|
|
69827ac |
IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
|
|
|
69827ac |
+ ELSEIF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libiopenexr")
|
|
|
69827ac |
+ MESSAGE(STATUS "OpenEXR is version 3 or greter.")
|
|
|
69827ac |
+ ELSE()
|
|
|
69827ac |
MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
|
|
|
69827ac |
ENDIF()
|
|
|
69827ac |
ELSE()
|