Skip to content

build: Raise fmt auto-build version to 12.1, handle Windows flags #5039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgritz merged 1 commit into from
Feb 11, 2026
Merged

build: Raise fmt auto-build version to 12.1, handle Windows flags #5039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/cmake/build_fmt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# fmt by hand!
######################################################################

set_cache (fmt_BUILD_VERSION 10.2.1 "fmt version for local builds")
set_cache (fmt_BUILD_VERSION 12.1.0 "fmt version for local builds")
set (fmt_GIT_REPOSITORY "https://github.com/fmtlib/fmt")
set (fmt_GIT_TAG "${fmt_BUILD_VERSION}")
# Note: fmt doesn't put "v" in front of version for its git tags
Expand All @@ -22,8 +22,6 @@ build_dependency_with_cmake(fmt
-D FMT_TEST=OFF
)

# Set some things up that we'll need for a subsequent find_package to work
set (fmt_ROOT ${fmt_INSTALL_DIR})

# Signal to caller that we need to find again at the installed location
set (fmt_REFIND TRUE)
set (fmt_VERSION ${fmt_BUILD_VERSION})
6 changes: 6 additions & 0 deletions src/libutil/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ function (setup_oiio_util_library targetname)
target_link_options(${targetname} PRIVATE
${${PROJECT_NAME}_link_options})

if (MSVC AND fmt_VERSION VERSION_GREATER_EQUAL 11.0)
# For MSVC, Unicode support requires compiling with /utf-8, and fmt
# needs this. This line adapted from fmt's CMakeLists.txt file.
target_compile_options(${targetname} PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
endif ()

target_include_directories (${targetname}
PUBLIC
$<BUILD_INTERFACE:${OpenImageIO_LOCAL_DEPS_ROOT}/include>
Expand Down
Loading