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/oiio.cmake b/cmake/dependencies/oiio.cmake index 8cef3c76e..ac74dcade 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,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) diff --git a/cmake/dependencies/spdlog.cmake b/cmake/dependencies/spdlog.cmake index 63d7a65f9..e27a03a3a 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 @@ -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 @@ -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 @@ -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)