From 0535c23e7164f07290937e3e73b3adfd93d633a8 Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Wed, 21 Jan 2026 20:20:39 -0800 Subject: [PATCH 1/4] spdlog 1.11 -> 1.17 bug fixes, security fixes, and feature improvements https://github.com/gabime/spdlog/releases https://github.com/gabime/spdlog/compare/v1.11.0...v1.17.0 Signed-off-by: Michael Oliver --- cmake/defaults/CYCOMMON.cmake | 4 ++-- cmake/dependencies/spdlog.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/defaults/CYCOMMON.cmake b/cmake/defaults/CYCOMMON.cmake index 2d3677f01..7e9f42197 100644 --- a/cmake/defaults/CYCOMMON.cmake +++ b/cmake/defaults/CYCOMMON.cmake @@ -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 diff --git a/cmake/dependencies/spdlog.cmake b/cmake/dependencies/spdlog.cmake index 63d7a65f9..1ebe2f80c 100644 --- a/cmake/dependencies/spdlog.cmake +++ b/cmake/dependencies/spdlog.cmake @@ -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 @@ -64,7 +64,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 From 03872402b7c7df01279bec1aa8e5b7bd576f4d27 Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Thu, 22 Jan 2026 14:27:48 -0800 Subject: [PATCH 2/4] add utf-8 compile flag for spdlog and oiio that lean on fmt Windows builds failing on spdlog and oiio because they bundle fmt which requires a utf-8 flag when compiling on windows. Error was D:\a\OpenRV\OpenRV\_build\RV_DEPS_SPDLOG\install\include\spdlog\fmt\bundled\base.h(465,28): error C2338: static_assert failed: 'Unicode support requires compiling with /utf-8' [D:\a\OpenRV\OpenRV\_build\src\lib\base\TwkUtil\TwkUtil.vcxproj] Signed-off-by: Michael Oliver --- cmake/dependencies/oiio.cmake | 7 +++++++ cmake/dependencies/spdlog.cmake | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/cmake/dependencies/oiio.cmake b/cmake/dependencies/oiio.cmake index 8cef3c76e..05eefd251 100644 --- a/cmake/dependencies/oiio.cmake +++ b/cmake/dependencies/oiio.cmake @@ -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) @@ -250,6 +251,12 @@ 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) diff --git a/cmake/dependencies/spdlog.cmake b/cmake/dependencies/spdlog.cmake index 1ebe2f80c..ac6077ca8 100644 --- a/cmake/dependencies/spdlog.cmake +++ b/cmake/dependencies/spdlog.cmake @@ -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 @@ -98,6 +99,13 @@ 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) From 6a347fe5f5828b93fba5de084f0387d3e3d01fbb Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Thu, 22 Jan 2026 15:45:58 -0800 Subject: [PATCH 3/4] format fixes format fixes Signed-off-by: Michael Oliver --- cmake/dependencies/spdlog.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/dependencies/spdlog.cmake b/cmake/dependencies/spdlog.cmake index ac6077ca8..e27a03a3a 100644 --- a/cmake/dependencies/spdlog.cmake +++ b/cmake/dependencies/spdlog.cmake @@ -102,7 +102,8 @@ TARGET_INCLUDE_DIRECTORIES( IF(RV_TARGET_WINDOWS) SET_TARGET_PROPERTIES( - spdlog::spdlog PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8" + spdlog::spdlog + PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8" ) ENDIF() From 8d4b5d67cff18c46fb48b0d63ca72a68e8cb5a79 Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Tue, 3 Mar 2026 08:41:55 -0800 Subject: [PATCH 4/4] format fix Signed-off-by: Michael Oliver --- cmake/dependencies/oiio.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/dependencies/oiio.cmake b/cmake/dependencies/oiio.cmake index 05eefd251..ac74dcade 100644 --- a/cmake/dependencies/oiio.cmake +++ b/cmake/dependencies/oiio.cmake @@ -253,7 +253,8 @@ TARGET_INCLUDE_DIRECTORIES( IF(RV_TARGET_WINDOWS) SET_TARGET_PROPERTIES( - oiio::oiio PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8" + oiio::oiio + PROPERTIES INTERFACE_COMPILE_OPTIONS "/utf-8" ) ENDIF()