Skip to content

Commit

Permalink
apps: fix compile error with OpenImageIO 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
atafra committed Dec 23, 2024
1 parent caa83e5 commit 4f5751a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Version History
---------------

- Added Intel Panther Lake GPU support
- Fixed compile error when building with OpenImageIO 3.x

### Changes in v2.3.1:

Expand Down
7 changes: 5 additions & 2 deletions apps/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ target_link_libraries(OpenImageDenoise_utils PUBLIC OpenImageDenoise_common Open
option(OIDN_APPS_OPENIMAGEIO "Enable OpenImageIO support in example and test apps." OFF)
if(OIDN_APPS_OPENIMAGEIO)
find_package(OpenImageIO REQUIRED)
if(OPENIMAGEIO_VERSION VERSION_GREATER_EQUAL "2.3")
if(OPENIMAGEIO_VERSION VERSION_GREATER_EQUAL "3")
# OpenImageIO 3.x requires C++17
set_target_properties(OpenImageDenoise_utils PROPERTIES CXX_STANDARD 17)
elseif(OPENIMAGEIO_VERSION VERSION_GREATER_EQUAL "2.3")
# OpenImageIO 2.3+ requires C++14
set_property(TARGET OpenImageDenoise_utils PROPERTY CXX_STANDARD 14)
set_target_properties(OpenImageDenoise_utils PROPERTIES CXX_STANDARD 14)
endif()
target_compile_definitions(OpenImageDenoise_utils PRIVATE OIDN_USE_OPENIMAGEIO)
target_link_libraries(OpenImageDenoise_utils PRIVATE OpenImageIO::OpenImageIO)
Expand Down

0 comments on commit 4f5751a

Please sign in to comment.