build(deps): support fmt 11.0

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Sep 29, 2024 · 5e918af · 5e918af
1 parent 609999e
commit 5e918af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -26,7 +26,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
  * **OpenColorIO >= 2.2** (tested through 2.3 and main)
  * libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested
    through 3.0)
- * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 10.2).
+ * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 11.0).
    If not found at build time, this will be automatically downloaded unless
    the build sets `-DBUILD_MISSING_FMT=OFF`.
 

diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -218,7 +218,7 @@ checked_find_package (Robinmap REQUIRED
 option (OIIO_INTERNALIZE_FMT "Copy fmt headers into <install>/include/OpenImageIO/detail/fmt" ON)
 checked_find_package (fmt REQUIRED
                       VERSION_MIN 7.0
-                      VERSION_MAX 10.99
+                      VERSION_MAX 11.99
                       BUILD_LOCAL missing
                      )
 get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)

diff --git a/src/include/OpenImageIO/detail/fmt.h b/src/include/OpenImageIO/detail/fmt.h
@@ -67,6 +67,12 @@ OIIO_PRAGMA_WARNING_PUSH
 #if OIIO_CLANG_VERSION >= 180000
 #    pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
+#if OIIO_CLANG_VERSION || OIIO_APPLE_CLANG_VERSION
+#    pragma clang diagnostic ignored "-Winvalid-noreturn"
+#endif
+// #if OIIO_GNUC_VERSION
+// #    pragma gcc diagnostic ignored "-Winvalid-noreturn"
+// #endif
 
 #include <OpenImageIO/detail/fmt/format.h>
 #include <OpenImageIO/detail/fmt/ostream.h>