mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-05-28 00:30:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support building with OpenEXR 3

Browse Source 
Try to find OpenEXR 3 first via the upstream cmake config and fallback to using our FindOpenEXR
This commit is contained in:
Antonio Rojas 2021-04-24 10:17:25 +00:00 committed by Albert Astals Cid
parent 224f892b09
commit 2429c95336
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -43,7 +43,10 @@ if (UNIX)
endif() endif()
endif() endif()
find_package(OpenEXR) find_package(OpenEXR 3.0 CONFIG QUIET)
if(NOT OpenEXR_FOUND)
find_package(OpenEXR)
endif()
set_package_properties(OpenEXR PROPERTIES set_package_properties(OpenEXR PROPERTIES
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "Required for the QImage plugin for OpenEXR images" PURPOSE "Required for the QImage plugin for OpenEXR images"

6
src/imageformats/CMakeLists.txt
View File

@ -58,7 +58,11 @@ install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugi
if(OpenEXR_FOUND) if(OpenEXR_FOUND)
kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp) kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp)
target_link_libraries(kimg_exr OpenEXR::IlmImf) if(TARGET OpenEXR::OpenEXR)
target_link_libraries(kimg_exr OpenEXR::OpenEXR)
else()
target_link_libraries(kimg_exr OpenEXR::IlmImf)
endif()
kde_target_enable_exceptions(kimg_exr PRIVATE) kde_target_enable_exceptions(kimg_exr PRIVATE)
install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)

1
src/imageformats/exr.cpp
View File

@ -18,6 +18,7 @@
#include <ImfConvert.h> #include <ImfConvert.h>
#include <ImfFloatAttribute.h> #include <ImfFloatAttribute.h>
#include <ImfInputFile.h> #include <ImfInputFile.h>
#include <ImfInt64.h>
#include <ImfIntAttribute.h> #include <ImfIntAttribute.h>
#include <ImfLineOrderAttribute.h> #include <ImfLineOrderAttribute.h>
#include <ImfRgbaFile.h> #include <ImfRgbaFile.h>