From 4f5751a530138fe1e9904c039c76eb3f2aff7b7d Mon Sep 17 00:00:00 2001 From: Attila Afra Date: Mon, 23 Dec 2024 20:47:52 +0200 Subject: [PATCH] apps: fix compile error with OpenImageIO 3.x --- CHANGELOG.md | 1 + apps/utils/CMakeLists.txt | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a3b87df..a317ee42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: diff --git a/apps/utils/CMakeLists.txt b/apps/utils/CMakeLists.txt index b2bad9f4..bd7497e9 100644 --- a/apps/utils/CMakeLists.txt +++ b/apps/utils/CMakeLists.txt @@ -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)