Skip to content

chore: spdlog 1.11.0 -> 1.17.0 #1170

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

Open
mcoliver wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore: spdlog 1.11.0 -> 1.17.0 #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0535c23
spdlog 1.11 -> 1.17
mcoliver Jan 22, 2026
0387240
add utf-8 compile flag for spdlog and oiio that lean on fmt
mcoliver Jan 22, 2026
6a347fe
format fixes
mcoliver Jan 22, 2026
8d4b5d6
format fix
mcoliver Mar 3, 2026
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
4 changes: 2 additions & 2 deletions cmake/defaults/CYCOMMON.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@ SET(RV_DEPS_RAW_VERSION_LIB

# spdlog https://github.com/gabime/spdlog
SET(RV_DEPS_SPDLOG_VERSION
"1.11.0"
"1.17.0"
)
SET(RV_DEPS_SPDLOG_DOWNLOAD_HASH
"cd620e0f103737a122a3b6539bd0a57a"
"f0d8dd02539fe609bdfd42c0549fe28d"
)

# tiff https://gitlab.com/libtiff/libtiff
Expand Down
8 changes: 8 additions & 0 deletions cmake/dependencies/oiio.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ LIST(APPEND _configure_options "-DOIIO_BUILD_TOOLS=OFF" "-DOIIO_BUILD_TESTS=OFF"

IF(RV_TARGET_WINDOWS)
LIST(PREPEND _configure_options "-G ${CMAKE_GENERATOR}")
LIST(APPEND _configure_options "-DCMAKE_CXX_FLAGS=/utf-8")
ENDIF()

IF(NOT RV_TARGET_WINDOWS)
Expand Down Expand Up @@ -250,6 +251,13 @@ TARGET_INCLUDE_DIRECTORIES(
INTERFACE ${_include_dir}
)

IF(RV_TARGET_WINDOWS)
SET_TARGET_PROPERTIES(
oiio::oiio
PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8"
)
ENDIF()

LIST(APPEND RV_DEPS_LIST oiio::oiio)

ADD_LIBRARY(oiio::utils SHARED IMPORTED GLOBAL)
Expand Down
13 changes: 11 additions & 2 deletions cmake/dependencies/spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PROCESSORCOUNT(_cpu_count)
RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_SPDLOG" "${RV_DEPS_SPDLOG_VERSION}" "" "")

SET(_download_url
"https://github.com/gabime/spdlog/archive/refs/tags/v${_version}.zip"
"https://github.com/gabime/spdlog/archive/refs/tags/v${_version}.tar.gz"
)

SET(_download_hash
Expand Down Expand Up @@ -54,6 +54,7 @@ IF(RV_TARGET_WINDOWS)
SET(_make_command
ninja
)
LIST(APPEND _configure_options "-DCMAKE_CXX_FLAGS=/utf-8")
ELSE()
SET(_make_command
make
Expand All @@ -64,7 +65,7 @@ LIST(APPEND _configure_options "-DSPDLOG_BUILD_EXAMPLE=OFF")

EXTERNALPROJECT_ADD(
${_target}
DOWNLOAD_NAME ${_target}_${_version}.zip
DOWNLOAD_NAME ${_target}_${_version}.tar.gz
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
SOURCE_DIR ${RV_DEPS_BASE_DIR}/${_target}/src
Expand Down Expand Up @@ -98,6 +99,14 @@ TARGET_INCLUDE_DIRECTORIES(
spdlog::spdlog
INTERFACE ${_include_dir}
)

IF(RV_TARGET_WINDOWS)
SET_TARGET_PROPERTIES(
spdlog::spdlog
PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8"
)
ENDIF()

LIST(APPEND RV_DEPS_LIST spdlog::spdlog)

IF(RV_TARGET_WINDOWS)
Expand Down